*/
public AnnotationPanel(AlignmentPanel ap)
{
+ setName("AnnotationPanel");
ToolTipManager.sharedInstance().registerComponent(this);
ToolTipManager.sharedInstance().setInitialDelay(0);
ToolTipManager.sharedInstance().setDismissDelay(10000);
@Override
public void colourSelected(Color c)
{
- HiddenColumns hiddenColumns = av.getAlignment().getHiddenColumns();
+ HiddenColumns hiddenColumns = av.getAlignment()
+ .getHiddenColumns();
for (int index : av.getColumnSelection().getSelected())
{
if (hiddenColumns.isVisible(index))
}
fAnot[index].colour = c;
}
- }};
+ }
+ };
};
- JalviewColourChooser.showColourChooser(this,
- title, Color.black, listener);
+ JalviewColourChooser.showColourChooser(this, title, Color.black,
+ listener);
}
else
// HELIX, SHEET or STEM
mouseDragLastX = -1;
mouseDragLastY = -1;
mouseDragging = false;
+ if (dragMode == DragMode.Resize)
+ {
+ ap.adjustAnnotationHeight();
+ }
dragMode = DragMode.Undefined;
ap.getScalePanel().mouseReleased(evt);
}
/**
- * DOCUMENT ME!
+ * Action on starting or continuing a mouse drag. There are two possible
+ * actions:
+ * <ul>
+ * <li>drag up or down on a graphed annotation increases or decreases the
+ * height of the graph</li>
+ * <li>dragging left or right selects the columns dragged across</li>
+ * </ul>
+ * 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)
{
/*
- * todo: if dragMode is Undefined:
+ * if dragMode is Undefined:
* - set to Select if dx > dy
* - set to Resize if dy > dx
* - do nothing if dx == dy
}
if (dragMode == DragMode.Undefined)
- {
+ {
/*
* drag is diagonal - defer deciding whether to
* treat as up/down or left/right
*/
- return;
- }
+ return;
+ }
try
{
int newHeight = Math.max(0, graphAnnotation.graphHeight + deltaY);
graphAnnotation.graphHeight = newHeight;
adjustPanelHeight();
+ setNoFastPaint();
ap.paintAlignment(false, false);
}
}
&& ann.annotations[column] != null)
{
tooltip = ann.annotations[column].description;
+ if ("".equals(tooltip))
+ {
+ tooltip = null;
+ }
}
return tooltip;
}
private volatile boolean imageFresh = false;
- private Rectangle visibleRect = new Rectangle(), clipBounds = new Rectangle();
+ private Rectangle visibleRect = new Rectangle(),
+ clipBounds = new Rectangle();
/**
* DOCUMENT ME!
@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.
+ // 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, visibleRect.width, visibleRect.height);
- if (image != null)
+ ViewportRanges ranges = av.getRanges();
+
+ if (allowFastPaint && image != null)
{
- // BH 2018 optimizing generation of new Rectangle().
- if (fastPaint || (visibleRect.width != (clipBounds = g.getClipBounds(clipBounds)).width)
- || (visibleRect.height != clipBounds.height))
+ // BH 2018 optimizing generation of new Rectangle().
+ if (fastPaint
+ || (visibleRect.width != (clipBounds = g
+ .getClipBounds(clipBounds)).width)
+ || (visibleRect.height != clipBounds.height))
{
return;
}
}
- imgWidth = (av.getRanges().getEndRes() - av.getRanges().getStartRes()
- + 1) * av.getCharWidth();
+ imgWidth = (ranges.getEndRes() - ranges.getStartRes() + 1)
+ * av.getCharWidth();
if (imgWidth < 1)
{
+ fastPaint = false;
return;
}
Graphics2D gg;
gg.setColor(Color.white);
gg.fillRect(0, 0, imgWidth, image.getHeight());
imageFresh = true;
- } else {
- gg = (Graphics2D) image.getGraphics();
+ }
+ else
+ {
+ gg = (Graphics2D) image.getGraphics();
}
}
/**
- * set true to enable redraw timing debug output on stderr
- */
- private final boolean debugRedraw = false;
-
- /**
* non-Thread safe repaint
*
* @param horizontal
int er = av.getRanges().getEndRes() + 1;
int transX = 0;
- Graphics2D gg = (Graphics2D) image.getGraphics();
-
- gg.copyArea(0, 0, imgWidth, getHeight(),
- -horizontal * av.getCharWidth(), 0);
-
- if (horizontal > 0) // scrollbar pulled right, image to the left
+ if (er == sr + 1)
{
- transX = (er - sr - horizontal) * av.getCharWidth();
- sr = er - horizontal;
+ fastPaint = false;
+ return;
}
- else if (horizontal < 0)
- {
- er = sr - horizontal;
+ Graphics2D gg = (Graphics2D) image.getGraphics();
+
+ if (imgWidth>Math.abs(horizontal*av.getCharWidth())) {
+ //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);
gg.translate(-transX, 0);
gg.dispose();
-
fastPaint = true;
// Call repaint on alignment panel so that repaints from other alignment
private int[] bounds = new int[2];
+ private boolean allowFastPaint;
@Override
public int[] getVisibleVRange()
{
ap = null;
image = null;
fadedImage = null;
-// gg = null;
+ // gg = null;
_mwl = null;
/*
}
return annotationHeight;
}
+
+ /**
+ * Clears the flag that allows a 'fast paint' on the next repaint, so
+ * requiring a full repaint
+ */
+ public void setNoFastPaint()
+ {
+ allowFastPaint = false;
+ }
}