X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FAnnotationPanel.java;h=92e1dbc39d1b007ee46895d57f0cca879c199af3;hb=1140532d01b32b648e7e5b17ea717ae790625f8f;hp=37506053b8b8fe75c99ffc66093d1e040188722f;hpb=2f4f1d8fb6878271b64f327bc58c895f458137af;p=jalview.git
diff --git a/src/jalview/gui/AnnotationPanel.java b/src/jalview/gui/AnnotationPanel.java
index 3750605..6c9cb6c 100755
--- a/src/jalview/gui/AnnotationPanel.java
+++ b/src/jalview/gui/AnnotationPanel.java
@@ -1,33 +1,80 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.0b1)
- * Copyright (C) 2014 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
*
* 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.
+ * 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 .
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview. If not, see .
* The Jalview Authors are detailed in the 'AUTHORS' file.
*/
package jalview.gui;
-import java.awt.*;
-import java.awt.event.*;
-import java.awt.image.*;
-
-import javax.swing.*;
-
-import jalview.datamodel.*;
+import java.awt.AlphaComposite;
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.FontMetrics;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.Image;
+import java.awt.Rectangle;
+import java.awt.RenderingHints;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.AdjustmentEvent;
+import java.awt.event.AdjustmentListener;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
+import java.awt.event.MouseMotionListener;
+import java.awt.event.MouseWheelEvent;
+import java.awt.event.MouseWheelListener;
+import java.awt.image.BufferedImage;
+import java.beans.PropertyChangeEvent;
+import java.util.ArrayList;
+import java.util.BitSet;
+import java.util.Collections;
+import java.util.List;
+
+import javax.swing.JMenuItem;
+import javax.swing.JPanel;
+import javax.swing.JPopupMenu;
+import javax.swing.Scrollable;
+import javax.swing.ToolTipManager;
+
+import jalview.api.AlignViewportI;
+import jalview.datamodel.AlignmentAnnotation;
+import jalview.datamodel.AlignmentI;
+import jalview.datamodel.Annotation;
+import jalview.datamodel.ColumnSelection;
+import jalview.datamodel.ContactListI;
+import jalview.datamodel.ContactMatrixI;
+import jalview.datamodel.ContactRange;
+import jalview.datamodel.GraphLine;
+import jalview.datamodel.HiddenColumns;
+import jalview.datamodel.SequenceI;
+import jalview.gui.JalviewColourChooser.ColourChooserListener;
import jalview.renderer.AnnotationRenderer;
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;
/**
* AnnotationPanel displays visible portion of annotation rows below unwrapped
@@ -38,22 +85,27 @@ import jalview.util.MessageManager;
*/
public class AnnotationPanel extends JPanel implements AwtRenderPanelI,
MouseListener, MouseWheelListener, MouseMotionListener,
- ActionListener, AdjustmentListener, Scrollable
+ ActionListener, AdjustmentListener, Scrollable, ViewportListenerI
{
- final String HELIX = "Helix";
+ enum DragMode
+ {
+ Select, Resize, Undefined, MatrixSelect
+ };
- final String SHEET = "Sheet";
+ String HELIX = MessageManager.getString("label.helix");
+
+ String SHEET = MessageManager.getString("label.sheet");
/**
* For RNA secondary structure "stems" aka helices
*/
- final String STEM = "RNA Helix";
+ String STEM = MessageManager.getString("label.rna_helix");
- final String LABEL = "Label";
+ String LABEL = MessageManager.getString("label.label");
- final String REMOVE = "Remove Annotation";
+ String REMOVE = MessageManager.getString("label.remove_annotation");
- final String COLOUR = "Colour";
+ String COLOUR = MessageManager.getString("action.colour");
public final Color HELIX_COLOUR = Color.red.darker();
@@ -72,7 +124,7 @@ public class AnnotationPanel extends JPanel implements AwtRenderPanelI,
public volatile BufferedImage fadedImage;
- Graphics2D gg;
+ // private Graphics2D gg;
public FontMetrics fm;
@@ -83,15 +135,17 @@ public class AnnotationPanel extends JPanel implements AwtRenderPanelI,
// Used For mouse Dragging and resizing graphs
int graphStretch = -1;
- int graphStretchY = -1;
+ int mouseDragLastX = -1;
- int min; // used by mouseDragged to see if user
+ int mouseDragLastY = -1;
- int max; // used by mouseDragged to see if user
+ int firstDragX = -1;
- boolean mouseDragging = false;
+ int firstDragY = -1;
+
+ DragMode dragMode = DragMode.Undefined;
- boolean MAC = false;
+ boolean mouseDragging = false;
// for editing cursor
int cursorX = 0;
@@ -102,6 +156,8 @@ public class AnnotationPanel extends JPanel implements AwtRenderPanelI,
private MouseWheelListener[] _mwl;
+ private boolean notJustOne;
+
/**
* Creates a new AnnotationPanel object.
*
@@ -110,9 +166,6 @@ public class AnnotationPanel extends JPanel implements AwtRenderPanelI,
*/
public AnnotationPanel(AlignmentPanel ap)
{
-
- MAC = new jalview.util.Platform().isAMac();
-
ToolTipManager.sharedInstance().registerComponent(this);
ToolTipManager.sharedInstance().setInitialDelay(0);
ToolTipManager.sharedInstance().setDismissDelay(10000);
@@ -129,6 +182,8 @@ public class AnnotationPanel extends JPanel implements AwtRenderPanelI,
// and then set our own listener to consume all mousewheel events
ap.annotationScroller.addMouseWheelListener(this);
renderer = new AnnotationRenderer();
+
+ av.getRanges().addPropertyChangeListener(this);
}
public AnnotationPanel(AlignViewport av)
@@ -143,13 +198,14 @@ public class AnnotationPanel extends JPanel implements AwtRenderPanelI,
if (e.isShiftDown())
{
e.consume();
- if (e.getWheelRotation() > 0)
+ double wheelRotation = e.getPreciseWheelRotation();
+ if (wheelRotation > 0)
{
- ap.scrollRight(true);
+ av.getRanges().scrollRight(true);
}
- else
+ else if (wheelRotation < 0)
{
- ap.scrollRight(false);
+ av.getRanges().scrollRight(false);
}
}
else
@@ -173,7 +229,8 @@ public class AnnotationPanel extends JPanel implements AwtRenderPanelI,
@Override
public Dimension getPreferredScrollableViewportSize()
{
- return getPreferredSize();
+ Dimension ps = getPreferredSize();
+ return new Dimension(ps.width, adjustForAlignFrame(false, ps.height));
}
@Override
@@ -213,7 +270,7 @@ public class AnnotationPanel extends JPanel implements AwtRenderPanelI,
public void adjustmentValueChanged(AdjustmentEvent evt)
{
// update annotation label display
- ap.alabels.setScrollOffset(-evt.getValue());
+ ap.getAlabels().setScrollOffset(-evt.getValue());
}
/**
@@ -253,24 +310,29 @@ public class AnnotationPanel extends JPanel implements AwtRenderPanelI,
if (anot.length < av.getColumnSelection().getMax())
{
- Annotation[] temp = new Annotation[av.getColumnSelection().getMax() + 2];
+ Annotation[] temp = new Annotation[av.getColumnSelection().getMax()
+ + 2];
System.arraycopy(anot, 0, temp, 0, anot.length);
anot = temp;
aa[activeRow].annotations = anot;
}
- if (evt.getActionCommand().equals(REMOVE))
+ String action = evt.getActionCommand();
+ if (action.equals(REMOVE))
{
- for (int i = 0; i < av.getColumnSelection().size(); i++)
+ for (int index : av.getColumnSelection().getSelected())
{
- anot[av.getColumnSelection().columnAt(i)] = null;
+ if (av.getAlignment().getHiddenColumns().isVisible(index))
+ {
+ anot[index] = null;
+ }
}
}
- else if (evt.getActionCommand().equals(LABEL))
+ else if (action.equals(LABEL))
{
- String exMesg = collectAnnotVals(anot, av.getColumnSelection(), LABEL);
- String label = JOptionPane.showInputDialog(this, MessageManager.getString("label.enter_label"),
- exMesg);
+ String exMesg = collectAnnotVals(anot, LABEL);
+ String label = JvOptionPane.showInputDialog(
+ MessageManager.getString("label.enter_label"), exMesg);
if (label == null)
{
@@ -282,19 +344,16 @@ public class AnnotationPanel extends JPanel implements AwtRenderPanelI,
aa[activeRow].hasText = true;
}
- for (int i = 0; i < av.getColumnSelection().size(); i++)
+ for (int index : av.getColumnSelection().getSelected())
{
- int index = av.getColumnSelection().columnAt(i);
-
- if (!av.getColumnSelection().isVisible(index))
+ if (!av.getAlignment().getHiddenColumns().isVisible(index))
+ {
continue;
+ }
if (anot[index] == null)
{
- anot[index] = new Annotation(label, "", ' ', 0); // TODO: verify that
- // null exceptions
- // aren't raised
- // elsewhere.
+ anot[index] = new Annotation(label, "", ' ', 0);
}
else
{
@@ -302,47 +361,56 @@ public class AnnotationPanel extends JPanel implements AwtRenderPanelI,
}
}
}
- else if (evt.getActionCommand().equals(COLOUR))
+ else if (action.equals(COLOUR))
{
- Color col = JColorChooser.showDialog(this,
- "Choose foreground colour", Color.black);
-
- for (int i = 0; i < av.getColumnSelection().size(); i++)
+ final Annotation[] fAnot = anot;
+ String title = MessageManager
+ .getString("label.select_foreground_colour");
+ ColourChooserListener listener = new ColourChooserListener()
{
- int index = av.getColumnSelection().columnAt(i);
-
- if (!av.getColumnSelection().isVisible(index))
- continue;
-
- if (anot[index] == null)
+ @Override
+ public void colourSelected(Color c)
{
- anot[index] = new Annotation("", "", ' ', 0);
- }
-
- anot[index].colour = col;
- }
+ HiddenColumns hiddenColumns = av.getAlignment()
+ .getHiddenColumns();
+ for (int index : av.getColumnSelection().getSelected())
+ {
+ if (hiddenColumns.isVisible(index))
+ {
+ if (fAnot[index] == null)
+ {
+ fAnot[index] = new Annotation("", "", ' ', 0);
+ }
+ fAnot[index].colour = c;
+ }
+ }
+ };
+ };
+ JalviewColourChooser.showColourChooser(this, title, Color.black,
+ listener);
}
else
- // HELIX OR SHEET
+ // HELIX, SHEET or STEM
{
char type = 0;
- String symbol = "\u03B1";
+ String symbol = "\u03B1"; // alpha
- if (evt.getActionCommand().equals(HELIX))
+ if (action.equals(HELIX))
{
type = 'H';
}
- else if (evt.getActionCommand().equals(SHEET))
+ else if (action.equals(SHEET))
{
type = 'E';
- symbol = "\u03B2";
+ symbol = "\u03B2"; // beta
}
// Added by LML to color stems
- else if (evt.getActionCommand().equals(STEM))
+ else if (action.equals(STEM))
{
type = 'S';
- symbol = "\u03C3";
+ int column = av.getColumnSelection().getSelectedRanges().get(0)[0];
+ symbol = aa[activeRow].getDefaultRnaHelixSymbol(column);
}
if (!aa[activeRow].hasIcons)
@@ -350,8 +418,8 @@ public class AnnotationPanel extends JPanel implements AwtRenderPanelI,
aa[activeRow].hasIcons = true;
}
- String label = JOptionPane.showInputDialog(
- MessageManager.getString("label.enter_label_for_the_structure"), symbol);
+ String label = JvOptionPane.showInputDialog(MessageManager
+ .getString("label.enter_label_for_the_structure"), symbol);
if (label == null)
{
@@ -361,63 +429,88 @@ public class AnnotationPanel extends JPanel implements AwtRenderPanelI,
if ((label.length() > 0) && !aa[activeRow].hasText)
{
aa[activeRow].hasText = true;
+ if (action.equals(STEM))
+ {
+ aa[activeRow].showAllColLabels = true;
+ }
}
-
- for (int i = 0; i < av.getColumnSelection().size(); i++)
+ for (int index : av.getColumnSelection().getSelected())
{
- int index = av.getColumnSelection().columnAt(i);
-
- if (!av.getColumnSelection().isVisible(index))
+ if (!av.getAlignment().getHiddenColumns().isVisible(index))
+ {
continue;
+ }
if (anot[index] == null)
{
anot[index] = new Annotation(label, "", type, 0);
}
- anot[index].secondaryStructure = type;
+ anot[index].secondaryStructure = type != 'S' ? type
+ : label.length() == 0 ? ' ' : label.charAt(0);
anot[index].displayCharacter = label;
+
}
}
+
av.getAlignment().validateAnnotation(aa[activeRow]);
ap.alignmentChanged();
-
+ ap.alignFrame.setMenusForViewport();
adjustPanelHeight();
repaint();
return;
}
- private String collectAnnotVals(Annotation[] anot,
- ColumnSelection columnSelection, String label2)
+ /**
+ * Returns any existing annotation concatenated as a string. For each
+ * annotation, takes the description, if any, else the secondary structure
+ * character (if type is HELIX, SHEET or STEM), else the display character (if
+ * type is LABEL).
+ *
+ * @param anots
+ * @param type
+ * @return
+ */
+ private String collectAnnotVals(Annotation[] anots, String type)
{
- String collatedInput = "";
+ // TODO is this method wanted? why? 'last' is not used
+
+ StringBuilder collatedInput = new StringBuilder(64);
String last = "";
ColumnSelection viscols = av.getColumnSelection();
- // TODO: refactor and save av.getColumnSelection for efficiency
- for (int i = 0; i < columnSelection.size(); i++)
+ HiddenColumns hidden = av.getAlignment().getHiddenColumns();
+
+ /*
+ * the selection list (read-only view) is in selection order, not
+ * column order; make a copy so we can sort it
+ */
+ List selected = new ArrayList<>(viscols.getSelected());
+ Collections.sort(selected);
+ for (int index : selected)
{
- int index = columnSelection.columnAt(i);
// always check for current display state - just in case
- if (!viscols.isVisible(index))
+ if (!hidden.isVisible(index))
+ {
continue;
+ }
String tlabel = null;
- if (anot[index] != null)
+ if (anots[index] != null)
{ // LML added stem code
- if (label2.equals(HELIX) || label2.equals(SHEET)
- || label2.equals(STEM) || label2.equals(LABEL))
+ if (type.equals(HELIX) || type.equals(SHEET) || type.equals(STEM)
+ || type.equals(LABEL))
{
- tlabel = anot[index].description;
+ tlabel = anots[index].description;
if (tlabel == null || tlabel.length() < 1)
{
- if (label2.equals(HELIX) || label2.equals(SHEET)
- || label2.equals(STEM))
+ if (type.equals(HELIX) || type.equals(SHEET)
+ || type.equals(STEM))
{
- tlabel = "" + anot[index].secondaryStructure;
+ tlabel = "" + anots[index].secondaryStructure;
}
else
{
- tlabel = "" + anot[index].displayCharacter;
+ tlabel = "" + anots[index].displayCharacter;
}
}
}
@@ -425,20 +518,21 @@ public class AnnotationPanel extends JPanel implements AwtRenderPanelI,
{
if (last.length() > 0)
{
- collatedInput += " ";
+ collatedInput.append(" ");
}
- collatedInput += tlabel;
+ collatedInput.append(tlabel);
}
}
}
- return collatedInput;
+ return collatedInput.toString();
}
/**
- * DOCUMENT ME!
+ * Action on right mouse pressed on Mac is to show a pop-up menu for the
+ * annotation. Action on left mouse pressed is to find which annotation is
+ * pressed and mark the start of a column selection or graph resize operation.
*
* @param evt
- * DOCUMENT ME!
*/
@Override
public void mousePressed(MouseEvent evt)
@@ -449,9 +543,18 @@ public class AnnotationPanel extends JPanel implements AwtRenderPanelI,
{
return;
}
+ mouseDragLastX = evt.getX();
+ mouseDragLastY = evt.getY();
+ /*
+ * add visible annotation heights until we reach the y
+ * position, to find which annotation it is in
+ */
int height = 0;
activeRow = -1;
+ int yOffset = 0;
+ // todo could reuse getRowIndexAndOffset ?
+ final int y = evt.getY();
for (int i = 0; i < aa.length; i++)
{
@@ -460,86 +563,337 @@ public class AnnotationPanel extends JPanel implements AwtRenderPanelI,
height += aa[i].height;
}
- if (evt.getY() < height)
+ if (y < height)
{
if (aa[i].editable)
{
activeRow = i;
}
- else if (aa[i].graph > 0)
+ else if (aa[i].graph != 0)
{
- // Stretch Graph
+ /*
+ * we have clicked on a resizable graph annotation
+ */
graphStretch = i;
- graphStretchY = evt.getY();
+ yOffset = height - y;
}
-
break;
}
}
- if (SwingUtilities.isRightMouseButton(evt) && activeRow != -1)
+ /*
+ * isPopupTrigger fires in mousePressed on Mac,
+ * not until mouseRelease on Windows
+ */
+ if (evt.isPopupTrigger() && activeRow != -1)
{
- if (av.getColumnSelection() == null)
- {
- return;
- }
+ showPopupMenu(y, evt.getX());
+ return;
+ }
- JPopupMenu pop = new JPopupMenu("Structure type");
- JMenuItem item;
- /*
- * Just display the needed structure options
- */
- if (av.getAlignment().isNucleotide() == true)
+ if (graphStretch != -1)
+ {
+
+ if (aa[graphStretch].graph == AlignmentAnnotation.CONTACT_MAP)
{
- item = new JMenuItem(STEM);
- item.addActionListener(this);
- pop.add(item);
+ // data in row has position on y as well as x axis
+ if (evt.isAltDown() || evt.isAltGraphDown())
+ {
+ dragMode = DragMode.MatrixSelect;
+ firstDragX = mouseDragLastX;
+ firstDragY = mouseDragLastY;
+ }
}
- else
+ }
+ else
+ {
+ // no row (or row that can be adjusted) was pressed. Simulate a ruler
+ // click
+ ap.getScalePanel().mousePressed(evt);
+ }
+ }
+
+ /**
+ * checks whether the annotation row under the mouse click evt's handles the
+ * event
+ *
+ * @param evt
+ * @return false if evt was not handled
+ */
+ boolean matrix_clicked(MouseEvent evt)
+ {
+ int[] rowIndex = getRowIndexAndOffset(evt.getY(),
+ av.getAlignment().getAlignmentAnnotation());
+ if (rowIndex == null)
+ {
+ 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]];
+ if (clicked.graph != AlignmentAnnotation.CONTACT_MAP)
+ {
+ return false;
+ }
+
+ // TODO - use existing threshold to select related sections of matrix
+ GraphLine thr = clicked.getThreshold();
+
+ int currentX = getColumnForXPos(evt.getX());
+ ContactListI forCurrentX = av.getContactList(clicked, currentX);
+ if (forCurrentX != null)
+ {
+ ContactGeometry cXcgeom = new ContactGeometry(forCurrentX,
+ clicked.graphHeight);
+ ContactGeometry.contactInterval cXci = cXcgeom.mapFor(yOffset);
+ if (cXci != null)
{
- item = new JMenuItem(HELIX);
- item.addActionListener(this);
- pop.add(item);
- item = new JMenuItem(SHEET);
- item.addActionListener(this);
- pop.add(item);
+ /**
+ * 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);
+
+ // double click selects the whole group
+ if (evt.getClickCount() == 2)
+ {
+ ContactMatrixI matrix = av.getContactMatrix(clicked);
+
+ if (matrix != null)
+ {
+ // simplest approach is to select all group containing column
+ if (matrix.hasGroups())
+ {
+ 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);
+ }
+
+ HiddenColumns hc = av.getAlignment().getHiddenColumns();
+ ColumnSelection cs = av.getColumnSelection();
+
+ for (int p = grp.nextSetBit(0); p >= 0; p = grp
+ .nextSetBit(p + 1))
+ {
+ 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
+
+ }
+ }
+ else
+ {
+ // select corresponding range in segment under mouse
+ {
+ int[] rng = forCurrentX.getMappedPositionsFor(fr, to);
+ if (rng != null)
+ {
+ av.getColumnSelection().addRangeOfElements(rng, true);
+ }
+ av.getColumnSelection().addElement(currentX);
+ }
+ // PAE SPECIFIC
+ // and also select everything lower than the max range adjacent
+ // (kind of works)
+ if (evt.isControlDown()
+ && PAEContactMatrix.PAEMATRIX.equals(clicked.getCalcId()))
+ {
+ 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)
+ {
+ 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--;
+ }
+ c = to;
+ while (c < forCurrentX.getContactHeight())
+ {
+ 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++;
+
+ }
+ }
+
+ }
}
- item = new JMenuItem(LABEL);
+ }
+ ap.paintAlignment(false, false);
+ PaintRefresher.Refresh(ap, av.getSequenceSetId());
+ av.sendSelection();
+ return true;
+ }
+
+ /**
+ * Construct and display a context menu at the right-click position
+ *
+ * @param y
+ * @param x
+ */
+ void showPopupMenu(final int y, int x)
+ {
+ if (av.getColumnSelection() == null
+ || av.getColumnSelection().isEmpty())
+ {
+ return;
+ }
+
+ JPopupMenu pop = new JPopupMenu(
+ MessageManager.getString("label.structure_type"));
+ JMenuItem item;
+ /*
+ * Just display the needed structure options
+ */
+ if (av.getAlignment().isNucleotide())
+ {
+ item = new JMenuItem(STEM);
item.addActionListener(this);
pop.add(item);
- item = new JMenuItem(COLOUR);
+ }
+ else
+ {
+ item = new JMenuItem(HELIX);
item.addActionListener(this);
pop.add(item);
- item = new JMenuItem(REMOVE);
+ item = new JMenuItem(SHEET);
item.addActionListener(this);
pop.add(item);
- pop.show(this, evt.getX(), evt.getY());
-
- return;
}
-
- if (aa == null)
- {
- return;
- }
-
- ap.scalePanel.mousePressed(evt);
-
+ item = new JMenuItem(LABEL);
+ item.addActionListener(this);
+ pop.add(item);
+ item = new JMenuItem(COLOUR);
+ item.addActionListener(this);
+ pop.add(item);
+ item = new JMenuItem(REMOVE);
+ item.addActionListener(this);
+ pop.add(item);
+ pop.show(this, x, y);
}
/**
- * DOCUMENT ME!
+ * Action on mouse up is to clear mouse drag data and call mouseReleased on
+ * ScalePanel, to deal with defining the selection group (if any) defined by
+ * the mouse drag
*
* @param evt
- * DOCUMENT ME!
*/
@Override
public void mouseReleased(MouseEvent evt)
{
+ if (dragMode == DragMode.MatrixSelect)
+ {
+ matrixSelectRange(evt);
+ }
graphStretch = -1;
- graphStretchY = -1;
+ mouseDragLastX = -1;
+ mouseDragLastY = -1;
+ firstDragX = -1;
+ firstDragY = -1;
mouseDragging = false;
- ap.scalePanel.mouseReleased(evt);
+ if (dragMode == DragMode.Resize)
+ {
+ ap.adjustAnnotationHeight();
+ }
+ dragMode = DragMode.Undefined;
+ if (!matrix_clicked(evt))
+ {
+ ap.getScalePanel().mouseReleased(evt);
+ }
+
+ /*
+ * isPopupTrigger is set in mouseReleased on Windows
+ * (in mousePressed on Mac)
+ */
+ if (evt.isPopupTrigger() && activeRow != -1)
+ {
+ showPopupMenu(evt.getY(), evt.getX());
+ }
+
}
/**
@@ -551,146 +905,495 @@ public class AnnotationPanel extends JPanel implements AwtRenderPanelI,
@Override
public void mouseEntered(MouseEvent evt)
{
- ap.scalePanel.mouseEntered(evt);
+ this.mouseDragging = false;
+ ap.getScalePanel().mouseEntered(evt);
}
/**
- * DOCUMENT ME!
+ * On leaving the panel, calls ScalePanel.mouseExited to deal with scrolling
+ * with column selection on a mouse drag
*
* @param evt
- * DOCUMENT ME!
*/
@Override
public void mouseExited(MouseEvent evt)
{
- ap.scalePanel.mouseExited(evt);
+ ap.getScalePanel().mouseExited(evt);
}
/**
- * DOCUMENT ME!
+ * Action on starting or continuing a mouse drag. There are two possible
+ * actions:
+ *
+ * - drag up or down on a graphed annotation increases or decreases the
+ * height of the graph
+ * - dragging left or right selects the columns dragged across
+ *
+ * A drag on a graph annotation is treated as column selection if it starts
+ * with more horizontal than vertical movement, and as resize if it starts
+ * with more vertical than horizontal movement. Once started, the drag does
+ * not change mode.
*
* @param evt
- * DOCUMENT ME!
*/
@Override
public void mouseDragged(MouseEvent evt)
{
- if (graphStretch > -1)
+ /*
+ * if dragMode is Undefined:
+ * - set to Select if dx > dy
+ * - set to Resize if dy > dx
+ * - do nothing if dx == dy
+ */
+ final int x = evt.getX();
+ final int y = evt.getY();
+ if (dragMode == DragMode.Undefined)
{
- av.getAlignment().getAlignmentAnnotation()[graphStretch].graphHeight += graphStretchY
- - evt.getY();
- if (av.getAlignment().getAlignmentAnnotation()[graphStretch].graphHeight < 0)
+ int dx = Math.abs(x - mouseDragLastX);
+ int dy = Math.abs(y - mouseDragLastY);
+ if (graphStretch == -1 || dx > dy)
{
- av.getAlignment().getAlignmentAnnotation()[graphStretch].graphHeight = 0;
+ /*
+ * mostly horizontal drag, or not a graph annotation
+ */
+ dragMode = DragMode.Select;
+ }
+ else if (dy > dx)
+ {
+ /*
+ * mostly vertical drag
+ */
+ dragMode = DragMode.Resize;
+ notJustOne = evt.isShiftDown();
+
+ /*
+ * but could also be a matrix drag
+ */
+ if ((evt.isAltDown() || evt.isAltGraphDown()) && (av.getAlignment()
+ .getAlignmentAnnotation()[graphStretch].graph == AlignmentAnnotation.CONTACT_MAP))
+ {
+ /*
+ * dragging in a matrix
+ */
+ dragMode = DragMode.MatrixSelect;
+ firstDragX = mouseDragLastX;
+ firstDragY = mouseDragLastY;
+ }
}
- graphStretchY = evt.getY();
- adjustPanelHeight();
- ap.paintAlignment(true);
}
- else
+
+ if (dragMode == DragMode.Undefined)
+
+ {
+ /*
+ * drag is diagonal - defer deciding whether to
+ * treat as up/down or left/right
+ */
+ return;
+ }
+
+ try
+ {
+ if (dragMode == DragMode.Resize)
+ {
+ /*
+ * resize graph annotation if mouse was dragged up or down
+ */
+ int deltaY = mouseDragLastY - evt.getY();
+ if (deltaY != 0)
+ {
+ AlignmentAnnotation graphAnnotation = av.getAlignment()
+ .getAlignmentAnnotation()[graphStretch];
+ int newHeight = Math.max(0, graphAnnotation.graphHeight + deltaY);
+ if (notJustOne)
+ {
+ for (AlignmentAnnotation similar : av.getAlignment()
+ .findAnnotations(null, graphAnnotation.getCalcId(),
+ graphAnnotation.label))
+ {
+ similar.graphHeight = newHeight;
+ }
+
+ }
+ else
+ {
+ graphAnnotation.graphHeight = newHeight;
+ }
+ adjustPanelHeight();
+ ap.paintAlignment(false, false);
+ }
+ }
+ else if (dragMode == DragMode.MatrixSelect)
+ {
+ /*
+ * TODO draw a rubber band for range
+ */
+ mouseDragLastX = x;
+ mouseDragLastY = y;
+ ap.paintAlignment(false, false);
+ }
+ else
+ {
+ /*
+ * for mouse drag left or right, delegate to
+ * ScalePanel to adjust the column selection
+ */
+ ap.getScalePanel().mouseDragged(evt);
+ }
+ } finally
+ {
+ mouseDragLastX = x;
+ mouseDragLastY = y;
+ }
+ }
+
+ public void matrixSelectRange(MouseEvent evt)
+ {
+ /*
+ * get geometry of drag
+ */
+ int fromY = Math.min(firstDragY, evt.getY());
+ int toY = Math.max(firstDragY, evt.getY());
+ int fromX = Math.min(firstDragX, evt.getX());
+ int toX = Math.max(firstDragX, evt.getX());
+
+ int deltaY = toY - fromY;
+ int deltaX = toX - fromX;
+
+ int[] rowIndex = getRowIndexAndOffset(fromY,
+ av.getAlignment().getAlignmentAnnotation());
+ int[] toRowIndex = getRowIndexAndOffset(toY,
+ av.getAlignment().getAlignmentAnnotation());
+
+ if (rowIndex == null || toRowIndex == null)
+ {
+ jalview.bin.Console.trace("Drag out of range. needs to be clipped");
+
+ }
+ if (rowIndex[0] != toRowIndex[0])
+ {
+ jalview.bin.Console
+ .trace("Drag went to another row. needs to be clipped");
+ }
+
+ // rectangular selection on matrix style annotation
+ AlignmentAnnotation cma = av.getAlignment()
+ .getAlignmentAnnotation()[rowIndex[0]];
+
+ int lastX = getColumnForXPos(fromX);
+ int currentX = getColumnForXPos(toX);
+ int fromXc = Math.min(lastX, currentX);
+ int toXc = Math.max(lastX, currentX);
+ ContactListI forFromX = av.getContactList(cma, fromXc);
+ ContactListI forToX = av.getContactList(cma, toXc);
+
+ if (forFromX != null && forToX != null)
{
- ap.scalePanel.mouseDragged(evt);
+ // 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 lastXci = xcgeom
+ .mapFor(rowIndex[1]);
+ ContactGeometry.contactInterval cXci = xcgeom.mapFor(rowIndex[1] + deltaY);
+
+ // mark rectangular region formed by drag
+ 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, cXci.cStart);
+ to = Math.max(lastXci.cEnd, cXci.cEnd);
+ int[] mappedPos = forFromX.getMappedPositionsFor(fr, to);
+ if (mappedPos != 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)
+ {
+ 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);
+
+ jalview.bin.Console.trace("Marking " + fr + " to " + to);
+ for (int c = fr; c <= to; c++)
+ {
+ av.getColumnSelection().addElement(c);
+ }
}
+
}
/**
- * DOCUMENT ME!
+ * Constructs the tooltip, and constructs and displays a status message, for
+ * the current mouse position
*
* @param evt
- * DOCUMENT ME!
*/
@Override
public void mouseMoved(MouseEvent evt)
{
+ int yPos = evt.getY();
AlignmentAnnotation[] aa = av.getAlignment().getAlignmentAnnotation();
+ int rowAndOffset[] = getRowIndexAndOffset(yPos, aa);
+ int row = rowAndOffset[0];
- if (aa == null)
+ if (row == -1)
{
this.setToolTipText(null);
return;
}
- int row = -1;
- int height = 0;
+ int column = getColumnForXPos(evt.getX());
+
+ AlignmentAnnotation ann = aa[row];
+ if (row > -1 && ann.annotations != null
+ && column < ann.annotations.length)
+ {
+ String toolTip = buildToolTip(ann, column, aa, rowAndOffset[1], av,
+ ap);
+ setToolTipText(toolTip == null ? null
+ : JvSwingUtils.wrapTooltip(true, toolTip));
+ String msg = getStatusMessage(av.getAlignment(), column, ann,
+ rowAndOffset[1], av);
+ ap.alignFrame.setStatus(msg);
+ }
+ else
+ {
+ this.setToolTipText(null);
+ ap.alignFrame.setStatus(" ");
+ }
+ }
+
+ private int getColumnForXPos(int x)
+ {
+ int column = (x / av.getCharWidth()) + av.getRanges().getStartRes();
+ column = Math.min(column, av.getRanges().getEndRes());
+
+ if (av.hasHiddenColumns())
+ {
+ column = av.getAlignment().getHiddenColumns()
+ .visibleToAbsoluteColumn(column);
+ }
+ return column;
+ }
+ /**
+ * Answers the index in the annotations array of the visible annotation at the
+ * given y position. This is done by adding the heights of visible annotations
+ * until the y position has been exceeded. Answers -1 if no annotations are
+ * visible, or the y position is below all annotations.
+ *
+ * @param yPos
+ * @param aa
+ * @return
+ */
+ static int getRowIndex(int yPos, AlignmentAnnotation[] aa)
+ {
+ if (aa == null)
+ {
+ return -1;
+ }
+ return getRowIndexAndOffset(yPos, aa)[0];
+ }
+
+ static int[] getRowIndexAndOffset(int yPos, AlignmentAnnotation[] aa)
+ {
+ int[] res = new int[2];
+ res[0] = -1;
+ res[1] = 0;
+ if (aa == null)
+ {
+ return res;
+ }
+ int row = -1;
+ int height = 0, lheight = 0;
for (int i = 0; i < aa.length; i++)
{
if (aa[i].visible)
{
+ lheight = height;
height += aa[i].height;
}
- if (evt.getY() < height)
+ if (height > yPos)
{
row = i;
-
+ res[0] = row;
+ res[1] = yPos-lheight;
break;
}
}
+ return res;
+ }
- if (row == -1)
+ /**
+ * Answers a tooltip for the annotation at the current mouse position, not
+ * wrapped in <html> tags (apply if wanted). Answers null if there is no
+ * tooltip to show.
+ *
+ * @param ann
+ * @param column
+ * @param anns
+ * @param rowAndOffset
+ */
+ static String buildToolTip(AlignmentAnnotation ann, int column,
+ AlignmentAnnotation[] anns, int rowAndOffset, AlignViewportI av,
+ AlignmentPanel ap)
+ {
+ String tooltip = null;
+ if (ann.graphGroup > -1)
{
- this.setToolTipText(null);
- return;
+ StringBuilder tip = new StringBuilder(32);
+ boolean first = true;
+ for (int i = 0; i < anns.length; i++)
+ {
+ if (anns[i].graphGroup == ann.graphGroup
+ && anns[i].annotations[column] != null)
+ {
+ if (!first)
+ {
+ tip.append("
");
+ }
+ first = false;
+ tip.append(anns[i].label);
+ String description = anns[i].annotations[column].description;
+ if (description != null && description.length() > 0)
+ {
+ tip.append(" ").append(description);
+ }
+ }
+ }
+ tooltip = first ? null : tip.toString();
}
-
- int res = (evt.getX() / av.getCharWidth()) + av.getStartRes();
-
- if (av.hasHiddenColumns())
+ else if (column < ann.annotations.length
+ && ann.annotations[column] != null)
{
- res = av.getColumnSelection().adjustForHiddenColumns(res);
+ tooltip = ann.annotations[column].description;
}
-
- if (row > -1 && aa[row].annotations != null
- && res < aa[row].annotations.length)
+ // TODO abstract tooltip generator so different implementations can be built
+ if (ann.graph == AlignmentAnnotation.CONTACT_MAP)
{
- if (aa[row].graphGroup > -1)
+ if (rowAndOffset>=ann.graphHeight)
+ {
+ return null;
+ }
+ ContactListI clist = av.getContactList(ann, column);
+ if (clist != null)
{
- StringBuffer tip = new StringBuffer("");
- for (int gg = 0; gg < aa.length; gg++)
+ ContactGeometry cgeom = new ContactGeometry(clist, ann.graphHeight);
+ ContactGeometry.contactInterval ci = cgeom.mapFor(rowAndOffset);
+ ContactRange cr = clist.getRangeFor(ci.cStart, ci.cEnd);
+ 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)
{
- if (aa[gg].graphGroup == aa[row].graphGroup
- && aa[gg].annotations[res] != 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)
{
- tip.append(aa[gg].label + " "
- + aa[gg].annotations[res].description + "
");
+ highlightPos[h][0] = ann.sequenceRef
+ .findPosition(mappedPos[p] - 1);
+ highlightPos[h][1] = ann.sequenceRef
+ .findPosition(mappedPos[p + 1] - 1);
}
}
- if (tip.length() != 6)
+ else
{
- tip.setLength(tip.length() - 4);
- this.setToolTipText(tip.toString() + "");
+ highlightPos = new int[][] { new int[] { col, col } };
}
+ ap.getStructureSelectionManager()
+ .highlightPositionsOn(ann.sequenceRef, highlightPos, null);
}
- else if (aa[row].annotations[res] != null
- && aa[row].annotations[res].description != null
- && aa[row].annotations[res].description.length() > 0)
- {
- this.setToolTipText(""+JvSwingUtils.wrapTooltip(aa[row].annotations[res].description)+"");
- }
- else
+ }
+ return tooltip;
+ }
+
+ /**
+ * Constructs and returns the status bar message
+ *
+ * @param al
+ * @param column
+ * @param ann
+ * @param rowAndOffset
+ */
+ static String getStatusMessage(AlignmentI al, int column,
+ AlignmentAnnotation ann, int rowAndOffset, AlignViewportI av)
+ {
+ /*
+ * show alignment column and annotation description if any
+ */
+ StringBuilder text = new StringBuilder(32);
+ text.append(MessageManager.getString("label.column")).append(" ")
+ .append(column + 1);
+
+ if (column < ann.annotations.length && ann.annotations[column] != null)
+ {
+ String description = ann.annotations[column].description;
+ if (description != null && description.trim().length() > 0)
{
- // clear the tooltip.
- this.setToolTipText(null);
+ text.append(" ").append(description);
}
+ }
- if (aa[row].annotations[res] != null)
+ /*
+ * if the annotation is sequence-specific, show the sequence number
+ * in the alignment, and (if not a gap) the residue and position
+ */
+ SequenceI seqref = ann.sequenceRef;
+ if (seqref != null)
+ {
+ int seqIndex = al.findIndex(seqref);
+ if (seqIndex != -1)
{
- StringBuffer text = new StringBuffer("Sequence position "
- + (res + 1));
-
- if (aa[row].annotations[res].description != null)
+ text.append(", ").append(MessageManager.getString("label.sequence"))
+ .append(" ").append(seqIndex + 1);
+ char residue = seqref.getCharAt(column);
+ if (!Comparison.isGap(residue))
{
- text.append(" " + aa[row].annotations[res].description);
+ text.append(" ");
+ String name;
+ if (al.isNucleotide())
+ {
+ name = ResidueProperties.nucleotideName
+ .get(String.valueOf(residue));
+ text.append(" Nucleotide: ")
+ .append(name != null ? name : residue);
+ }
+ else
+ {
+ name = 'X' == residue ? "X"
+ : ('*' == residue ? "STOP"
+ : ResidueProperties.aa2Triplet
+ .get(String.valueOf(residue)));
+ text.append(" Residue: ").append(name != null ? name : residue);
+ }
+ int residuePos = seqref.findPosition(column);
+ text.append(" (").append(residuePos).append(")");
}
-
- ap.alignFrame.statusBar.setText(text.toString());
}
}
- else
- {
- this.setToolTipText(null);
- }
+
+ return text.toString();
}
/**
@@ -702,21 +1405,21 @@ public class AnnotationPanel extends JPanel implements AwtRenderPanelI,
@Override
public void mouseClicked(MouseEvent evt)
{
-// if (activeRow != -1)
-// {
-// AlignmentAnnotation[] aa = av.getAlignment().getAlignmentAnnotation();
-// AlignmentAnnotation anot = aa[activeRow];
-// }
+ // if (activeRow != -1)
+ // {
+ // AlignmentAnnotation[] aa = av.getAlignment().getAlignmentAnnotation();
+ // AlignmentAnnotation anot = aa[activeRow];
+ // }
}
// TODO mouseClicked-content and drawCursor are quite experimental!
public void drawCursor(Graphics graphics, SequenceI seq, int res, int x1,
int y1)
{
- int pady = av.charHeight / 5;
+ int pady = av.getCharHeight() / 5;
int charOffset = 0;
graphics.setColor(Color.black);
- graphics.fillRect(x1, y1, av.charWidth, av.charHeight);
+ graphics.fillRect(x1, y1, av.getCharWidth(), av.getCharHeight());
if (av.validCharWidth)
{
@@ -724,15 +1427,18 @@ public class AnnotationPanel extends JPanel implements AwtRenderPanelI,
char s = seq.getCharAt(res);
- charOffset = (av.charWidth - fm.charWidth(s)) / 2;
+ charOffset = (av.getCharWidth() - fm.charWidth(s)) / 2;
graphics.drawString(String.valueOf(s), charOffset + x1,
- (y1 + av.charHeight) - pady);
+ (y1 + av.getCharHeight()) - pady);
}
}
private volatile boolean imageFresh = false;
+ private Rectangle visibleRect = new Rectangle(),
+ clipBounds = new Rectangle();
+
/**
* DOCUMENT ME!
*
@@ -742,42 +1448,72 @@ public class AnnotationPanel extends JPanel implements AwtRenderPanelI,
@Override
public void paintComponent(Graphics g)
{
+
+ // BH: note that this method is generally recommended to
+ // call super.paintComponent(g). Otherwise, the children of this
+ // component will not be rendered. That is not needed here
+ // because AnnotationPanel does not have any children. It is
+ // just a JPanel contained in a JViewPort.
+
+ computeVisibleRect(visibleRect);
+
g.setColor(Color.white);
- g.fillRect(0, 0, getWidth(), getHeight());
+ g.fillRect(0, 0, visibleRect.width, visibleRect.height);
if (image != null)
{
- if (fastPaint || (getVisibleRect().width != g.getClipBounds().width)
- || (getVisibleRect().height != g.getClipBounds().height))
+ // BH 2018 optimizing generation of new Rectangle().
+ if (fastPaint
+ || (visibleRect.width != (clipBounds = g
+ .getClipBounds(clipBounds)).width)
+ || (visibleRect.height != clipBounds.height))
{
+
g.drawImage(image, 0, 0, this);
fastPaint = false;
return;
}
}
- imgWidth = (av.endRes - av.startRes + 1) * av.charWidth;
+ updateFadedImageWidth();
if (imgWidth < 1)
+ {
return;
+ }
+ Graphics2D gg;
if (image == null || imgWidth != image.getWidth(this)
|| image.getHeight(this) != getHeight())
{
- try
- {
- image = new BufferedImage(imgWidth, ap.annotationPanel.getHeight(),
- BufferedImage.TYPE_INT_RGB);
- } catch (OutOfMemoryError oom)
+ boolean tried = false;
+ image = null;
+ while (image == null && !tried)
{
try
{
- System.gc();
- } catch (Exception x)
+ image = new BufferedImage(imgWidth,
+ ap.getAnnotationPanel().getHeight(),
+ BufferedImage.TYPE_INT_RGB);
+ tried = true;
+ } catch (IllegalArgumentException exc)
{
+ jalview.bin.Console.errPrintln(
+ "Serious issue with viewport geometry imgWidth requested was "
+ + imgWidth);
+ return;
+ } catch (OutOfMemoryError oom)
+ {
+ try
+ {
+ System.gc();
+ } catch (Exception x)
+ {
+ }
+ ;
+ new OOMWarning(
+ "Couldn't allocate memory to redraw screen. Please restart Jalview",
+ oom);
+ return;
}
- ;
- new OOMWarning(
- "Couldn't allocate memory to redraw screen. Please restart Jalview",
- oom);
- return;
+
}
gg = (Graphics2D) image.getGraphics();
@@ -793,15 +1529,31 @@ public class AnnotationPanel extends JPanel implements AwtRenderPanelI,
gg.fillRect(0, 0, imgWidth, image.getHeight());
imageFresh = true;
}
+ else
+ {
+ gg = (Graphics2D) image.getGraphics();
+
+ }
- drawComponent(gg, av.startRes, av.endRes + 1);
+ drawComponent(gg, av.getRanges().getStartRes(),
+ av.getRanges().getEndRes() + 1);
+ gg.dispose();
imageFresh = false;
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
*/
private final boolean debugRedraw = false;
+
/**
* non-Thread safe repaint
*
@@ -810,7 +1562,7 @@ public class AnnotationPanel extends JPanel implements AwtRenderPanelI,
*/
public void fastPaint(int horizontal)
{
- if ((horizontal == 0) || gg == null
+ if ((horizontal == 0) || image == null
|| av.getAlignment().getAlignmentAnnotation() == null
|| av.getAlignment().getAlignmentAnnotation().length < 1
|| av.isCalcInProgress())
@@ -818,36 +1570,43 @@ public class AnnotationPanel extends JPanel implements AwtRenderPanelI,
repaint();
return;
}
- long stime=System.currentTimeMillis();
- gg.copyArea(0, 0, imgWidth, getHeight(), -horizontal * av.charWidth, 0);
- long mtime=System.currentTimeMillis();
- int sr = av.startRes;
- int er = av.endRes + 1;
+
+ int sr = av.getRanges().getStartRes();
+ int er = av.getRanges().getEndRes() + 1;
int transX = 0;
- if (horizontal > 0) // scrollbar pulled right, image to the left
- {
- transX = (er - sr - horizontal) * av.charWidth;
- sr = er - horizontal;
- }
- else if (horizontal < 0)
+ Graphics2D gg = (Graphics2D) image.getGraphics();
+
+ if (imgWidth > Math.abs(horizontal * av.getCharWidth()))
{
- er = sr - horizontal;
- }
+ // scroll is less than imgWidth away so can re-use buffered graphics
+ gg.copyArea(0, 0, imgWidth, getHeight(),
+ -horizontal * av.getCharWidth(), 0);
+ if (horizontal > 0) // scrollbar pulled right, image to the left
+ {
+ transX = (er - sr - horizontal) * av.getCharWidth();
+ sr = er - horizontal;
+ }
+ else if (horizontal < 0)
+ {
+ er = sr - horizontal;
+ }
+ }
gg.translate(transX, 0);
drawComponent(gg, sr, er);
gg.translate(-transX, 0);
- long dtime=System.currentTimeMillis();
+
+ gg.dispose();
+
fastPaint = true;
- repaint();
- long rtime=System.currentTimeMillis();
- if (debugRedraw) {
- System.err.println("Scroll:\t"+horizontal+"\tCopyArea:\t"+(mtime-stime)+"\tDraw component:\t"+(dtime-mtime)+"\tRepaint call:\t"+(rtime-dtime));
- }
+ // Call repaint on alignment panel so that repaints from other alignment
+ // panel components can be aggregated. Otherwise performance of the overview
+ // window and others may be adversely affected.
+ av.getAlignPanel().repaint();
}
private volatile boolean lastImageGood = false;
@@ -876,10 +1635,10 @@ public class AnnotationPanel extends JPanel implements AwtRenderPanelI,
// and draw a faded image until the calculation
// has completed
if (lastImageGood
- && (fadedImage == null || fadedImage.getWidth() != imgWidth || fadedImage
- .getHeight() != image.getHeight()))
+ && (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);
@@ -889,8 +1648,8 @@ public class AnnotationPanel extends JPanel implements AwtRenderPanelI,
fadedG.setColor(Color.white);
fadedG.fillRect(0, 0, imgWidth, image.getHeight());
- fadedG.setComposite(AlphaComposite.getInstance(
- AlphaComposite.SRC_OVER, .3f));
+ fadedG.setComposite(
+ AlphaComposite.getInstance(AlphaComposite.SRC_OVER, .3f));
fadedG.drawImage(image, 0, 0, this);
}
@@ -907,9 +1666,9 @@ public class AnnotationPanel extends JPanel implements AwtRenderPanelI,
}
fadedImage = null;
}
-
+
g.setColor(Color.white);
- g.fillRect(0, 0, (endRes - startRes) * av.charWidth, getHeight());
+ g.fillRect(0, 0, (endRes - startRes) * av.getCharWidth(), getHeight());
g.setFont(av.getFont());
if (fm == null)
@@ -925,17 +1684,29 @@ public class AnnotationPanel extends JPanel implements AwtRenderPanelI,
g.setColor(Color.black);
if (av.validCharWidth)
{
- g.drawString(MessageManager.getString("label.alignment_has_no_annotations"), 20, 15);
+ g.drawString(MessageManager
+ .getString("label.alignment_has_no_annotations"), 20, 15);
}
return;
}
- lastImageGood = renderer.drawComponent(this, av, g, activeRow,
- startRes, endRes);
+ lastImageGood = renderer.drawComponent(this, av, g, activeRow, startRes,
+ endRes);
if (!lastImageGood && fadedImage == null)
{
fadedImage = oldFaded;
}
+ if (dragMode == DragMode.MatrixSelect)
+ {
+ g.setColor(Color.yellow);
+ g.drawRect(Math.min(firstDragX, mouseDragLastX),
+ Math.min(firstDragY, mouseDragLastY),
+ Math.max(firstDragX, mouseDragLastX)
+ - Math.min(firstDragX, mouseDragLastX),
+ Math.max(firstDragY, mouseDragLastY)
+ - Math.min(firstDragY, mouseDragLastY));
+
+ }
}
@Override
@@ -953,18 +1724,116 @@ public class AnnotationPanel extends JPanel implements AwtRenderPanelI,
@Override
public int getFadedImageWidth()
{
+ updateFadedImageWidth();
return imgWidth;
}
+
private int[] bounds = new int[2];
+
@Override
public int[] getVisibleVRange()
{
- if (ap!=null && ap.alabels!=null)
+ if (ap != null && ap.getAlabels() != null)
+ {
+ int sOffset = -ap.getAlabels().getScrollOffset();
+ int visHeight = sOffset + ap.annotationSpaceFillerHolder.getHeight();
+ bounds[0] = sOffset;
+ bounds[1] = visHeight;
+ return bounds;
+ }
+ else
+ {
+ return null;
+ }
+ }
+
+ /**
+ * Try to ensure any references held are nulled
+ */
+ public void dispose()
+ {
+ av = null;
+ ap = null;
+ image = null;
+ fadedImage = null;
+ // gg = null;
+ _mwl = null;
+
+ /*
+ * I created the renderer so I will dispose of it
+ */
+ if (renderer != null)
+ {
+ renderer.dispose();
+ }
+ }
+
+ @Override
+ public void propertyChange(PropertyChangeEvent evt)
+ {
+ // Respond to viewport range changes (e.g. alignment panel was scrolled)
+ // Both scrolling and resizing change viewport ranges: scrolling changes
+ // both start and end points, but resize only changes end values.
+ // Here we only want to fastpaint on a scroll, with resize using a normal
+ // paint, so scroll events are identified as changes to the horizontal or
+ // vertical start value.
+ if (evt.getPropertyName().equals(ViewportRanges.STARTRES))
{
- int sOffset=-ap.alabels.scrollOffset;
- int visHeight = sOffset+ap.annotationSpaceFillerHolder.getHeight();
- bounds[0] = sOffset; bounds[1]=visHeight;
- return bounds;
- } else return null;
+ fastPaint((int) evt.getNewValue() - (int) evt.getOldValue());
+ }
+ else if (evt.getPropertyName().equals(ViewportRanges.STARTRESANDSEQ))
+ {
+ fastPaint(((int[]) evt.getNewValue())[0]
+ - ((int[]) evt.getOldValue())[0]);
+ }
+ else if (evt.getPropertyName().equals(ViewportRanges.MOVE_VIEWPORT))
+ {
+ repaint();
+ }
+ }
+
+ /**
+ * computes the visible height of the annotation panel
+ *
+ * @param adjustPanelHeight
+ * - when false, just adjust existing height according to other
+ * windows
+ * @param annotationHeight
+ * @return height to use for the ScrollerPreferredVisibleSize
+ */
+ public int adjustForAlignFrame(boolean adjustPanelHeight,
+ int annotationHeight)
+ {
+ /*
+ * Estimate available height in the AlignFrame for alignment +
+ * annotations. Deduct an estimate for title bar, menu bar, scale panel,
+ * hscroll, status bar, insets.
+ */
+ int stuff = (ap.getViewName() != null ? 30 : 0)
+ + (Platform.isAMacAndNotJS() ? 120 : 140);
+ int availableHeight = ap.alignFrame.getHeight() - stuff;
+ int rowHeight = av.getCharHeight();
+
+ if (adjustPanelHeight)
+ {
+ int alignmentHeight = rowHeight * av.getAlignment().getHeight();
+
+ /*
+ * If not enough vertical space, maximize annotation height while keeping
+ * at least two rows of alignment visible
+ */
+ if (annotationHeight + alignmentHeight > availableHeight)
+ {
+ annotationHeight = Math.min(annotationHeight,
+ availableHeight - 2 * rowHeight);
+ }
+ }
+ else
+ {
+ // maintain same window layout whilst updating sliders
+ annotationHeight = Math.min(ap.annotationScroller.getSize().height,
+ availableHeight - 2 * rowHeight);
+ }
+ return annotationHeight;
}
}