import jalview.datamodel.ColumnSelection;
import jalview.datamodel.HiddenColumns;
import jalview.datamodel.SequenceI;
+import jalview.gui.JalviewColourChooser.ColourChooserListener;
import jalview.renderer.AnnotationRenderer;
import jalview.renderer.AwtRenderPanelI;
import jalview.schemes.ResidueProperties;
import jalview.util.Comparison;
import jalview.util.MessageManager;
+import jalview.util.Platform;
import jalview.viewmodel.ViewportListenerI;
import jalview.viewmodel.ViewportRanges;
import java.util.Collections;
import java.util.List;
-import javax.swing.JColorChooser;
import javax.swing.JMenuItem;
import javax.swing.JPanel;
import javax.swing.JPopupMenu;
MouseListener, MouseWheelListener, MouseMotionListener,
ActionListener, AdjustmentListener, Scrollable, ViewportListenerI
{
+ enum DragMode
+ {
+ Select, Resize, Undefined
+ };
+
String HELIX = MessageManager.getString("label.helix");
String SHEET = MessageManager.getString("label.sheet");
public volatile BufferedImage fadedImage;
- Graphics2D gg;
+ // private Graphics2D gg;
public FontMetrics fm;
// 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
+ DragMode dragMode = DragMode.Undefined;
boolean mouseDragging = false;
if (e.isShiftDown())
{
e.consume();
- if (e.getWheelRotation() > 0)
+ double wheelRotation = e.getPreciseWheelRotation();
+ if (wheelRotation > 0)
{
av.getRanges().scrollRight(true);
}
- else
+ else if (wheelRotation < 0)
{
av.getRanges().scrollRight(false);
}
@Override
public Dimension getPreferredScrollableViewportSize()
{
- return getPreferredSize();
+ Dimension ps = getPreferredSize();
+ return new Dimension(ps.width, adjustForAlignFrame(false, ps.height));
}
@Override
else if (action.equals(LABEL))
{
String exMesg = collectAnnotVals(anot, LABEL);
- String label = JvOptionPane.showInputDialog(this,
+ String label = JvOptionPane.showInputDialog(
MessageManager.getString("label.enter_label"), exMesg);
if (label == null)
}
else if (action.equals(COLOUR))
{
- Color col = JColorChooser.showDialog(this,
- MessageManager.getString("label.select_foreground_colour"),
- Color.black);
-
- for (int index : av.getColumnSelection().getSelected())
+ final Annotation[] fAnot = anot;
+ String title = MessageManager
+ .getString("label.select_foreground_colour");
+ ColourChooserListener listener = new ColourChooserListener()
{
- if (!av.getAlignment().getHiddenColumns().isVisible(index))
+ @Override
+ public void colourSelected(Color c)
{
- continue;
- }
-
- if (anot[index] == null)
- {
- 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, SHEET or STEM
}
/**
- * 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)
{
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;
}
else if (aa[i].graph > 0)
{
- // Stretch Graph
+ /*
+ * we have clicked on a resizable graph annotation
+ */
graphStretch = i;
- graphStretchY = y;
}
-
break;
}
}
}
/**
- * 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)
{
graphStretch = -1;
- graphStretchY = -1;
+ mouseDragLastX = -1;
+ mouseDragLastY = -1;
mouseDragging = false;
+ dragMode = DragMode.Undefined;
ap.getScalePanel().mouseReleased(evt);
/*
@Override
public void mouseEntered(MouseEvent 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)
@Override
public void mouseDragged(MouseEvent evt)
{
- if (graphStretch > -1)
+ /*
+ * todo: 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)
+ {
+ /*
+ * mostly horizontal drag, or not a graph annotation
+ */
+ dragMode = DragMode.Select;
+ }
+ else if (dy > dx)
{
- av.getAlignment()
- .getAlignmentAnnotation()[graphStretch].graphHeight = 0;
+ /*
+ * mostly vertical drag
+ */
+ dragMode = DragMode.Resize;
}
- graphStretchY = evt.getY();
- adjustPanelHeight();
- ap.paintAlignment(false, false);
}
- else
+
+ if (dragMode == DragMode.Undefined)
+ {
+ /*
+ * drag is diagonal - defer deciding whether to
+ * treat as up/down or left/right
+ */
+ return;
+ }
+
+ try
{
- ap.getScalePanel().mouseDragged(evt);
+ 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);
+ graphAnnotation.graphHeight = newHeight;
+ adjustPanelHeight();
+ 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;
}
}
if (av.hasHiddenColumns())
{
column = av.getAlignment().getHiddenColumns()
- .adjustForHiddenColumns(column);
+ .visibleToAbsoluteColumn(column);
}
AlignmentAnnotation ann = aa[row];
else
{
this.setToolTipText(null);
- ap.alignFrame.statusBar.setText(" ");
+ ap.alignFrame.setStatus(" ");
}
}
{
this.setToolTipText(JvSwingUtils.wrapTooltip(true, description));
}
+ else
+ {
+ this.setToolTipText(null); // no tooltip if null or empty description
+ }
}
else
{
}
}
- ap.alignFrame.statusBar.setText(text.toString());
+ ap.alignFrame.setStatus(text.toString());
}
/**
}
private volatile boolean imageFresh = false;
+ private Rectangle visibleRect = new Rectangle(), clipBounds = new Rectangle();
/**
* DOCUMENT ME!
@Override
public void paintComponent(Graphics g)
{
- super.paintComponent(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);
+
+
+ g.drawImage(image, 0, 0, this);
fastPaint = false;
return;
}
{
return;
}
+ Graphics2D gg;
if (image == null || imgWidth != image.getWidth(this)
|| image.getHeight(this) != getHeight())
{
gg.setColor(Color.white);
gg.fillRect(0, 0, imgWidth, image.getHeight());
imageFresh = true;
+ } else {
+ gg = (Graphics2D) image.getGraphics();
+
}
drawComponent(gg, av.getRanges().getStartRes(),
av.getRanges().getEndRes() + 1);
+ gg.dispose();
imageFresh = false;
g.drawImage(image, 0, 0, this);
}
*/
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())
int er = av.getRanges().getEndRes() + 1;
int transX = 0;
+ Graphics2D gg = (Graphics2D) image.getGraphics();
+
gg.copyArea(0, 0, imgWidth, getHeight(),
-horizontal * av.getCharWidth(), 0);
gg.translate(-transX, 0);
+ gg.dispose();
+
fastPaint = true;
// Call repaint on alignment panel so that repaints from other alignment
ap = null;
image = null;
fadedImage = null;
- gg = null;
+// gg = null;
_mwl = null;
/*
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.isAMac() ? 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;
}
}
git://source.jalview.org / jalview.git / blobdiff