import jalview.viewmodel.ViewportListenerI;
import java.awt.BorderLayout;
+import java.awt.Cursor;
import java.awt.Dimension;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
* @author $author$
* @version $Revision$
*/
-public class OverviewPanel extends JPanel implements Runnable,
- ViewportListenerI
+public class OverviewPanel extends JPanel
+ implements Runnable, ViewportListenerI
{
private OverviewDimensions od;
private boolean showHidden = true;
+ private boolean draggingBox = false;
+
/**
* Creates a new OverviewPanel object.
*
this.ap = alPanel;
od = new OverviewDimensionsShowHidden(av.getRanges(),
- (av.isShowAnnotation() && av
- .getAlignmentConservationAnnotation() != null));
+ (av.isShowAnnotation()
+ && av.getAlignmentConservationAnnotation() != null));
setSize(od.getWidth(), od.getHeight());
{
if (!SwingUtilities.isRightMouseButton(evt))
{
- od.updateViewportFromMouse(evt.getX(), evt.getY(), av
- .getAlignment().getHiddenSequences(), av.getAlignment()
- .getHiddenColumns());
+ if (draggingBox)
+ {
+ // set the mouse position as a fixed point in the box
+ // and drag relative to that position
+ od.adjustViewportFromMouse(evt.getX(), evt.getY(),
+ av.getAlignment().getHiddenSequences(),
+ av.getAlignment().getHiddenColumns());
+ }
+ else
+ {
+ od.updateViewportFromMouse(evt.getX(), evt.getY(),
+ av.getAlignment().getHiddenSequences(),
+ av.getAlignment().getHiddenColumns());
+ }
+ }
+ }
+
+ @Override
+ public void mouseMoved(MouseEvent evt)
+ {
+ if (od.isPositionInBox(evt.getX(), evt.getY()))
+ {
+ // display drag cursor at mouse position
+ setCursor(Cursor.getPredefinedCursor(Cursor.MOVE_CURSOR));
+ }
+ else
+ {
+ // reset cursor
+ setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
}
}
});
}
}
else
- // if (!av.getWrapAlignment())
{
- od.updateViewportFromMouse(evt.getX(), evt.getY(), av
- .getAlignment().getHiddenSequences(), av.getAlignment()
- .getHiddenColumns());
+ // don't do anything if the mouse press is in the overview's box
+ // (wait to see if it's a drag instead)
+ // otherwise update the viewport
+ if (!od.isPositionInBox(evt.getX(), evt.getY()))
+ {
+ draggingBox = false;
+ od.updateViewportFromMouse(evt.getX(), evt.getY(),
+ av.getAlignment().getHiddenSequences(),
+ av.getAlignment().getHiddenColumns());
+ }
+ else
+ {
+ draggingBox = true;
+ od.setDragPoint(evt.getX(), evt.getY(),
+ av.getAlignment().getHiddenSequences(),
+ av.getAlignment().getHiddenColumns());
+ }
}
}
{
showHidden = false;
od = new OverviewDimensionsHideHidden(av.getRanges(),
- (av.isShowAnnotation() && av
- .getAlignmentConservationAnnotation() != null));
+ (av.isShowAnnotation()
+ && av.getAlignmentConservationAnnotation() != null));
}
else
{
showHidden = true;
od = new OverviewDimensionsShowHidden(av.getRanges(),
- (av.isShowAnnotation() && av
- .getAlignmentConservationAnnotation() != null));
+ (av.isShowAnnotation()
+ && av.getAlignmentConservationAnnotation() != null));
}
oviewCanvas.resetOviewDims(od);
updateOverviewImage();
od.setWidth(getWidth());
od.setHeight(getHeight());
}
-
+
setPreferredSize(new Dimension(od.getWidth(), od.getHeight()));
if (oviewCanvas.restartDraw())
public void run()
{
oviewCanvas.draw(av.isShowSequenceFeatures(),
- (av.isShowAnnotation() && av
- .getAlignmentConservationAnnotation() != null), ap
- .getSeqPanel().seqCanvas.getFeatureRenderer());
+ (av.isShowAnnotation()
+ && av.getAlignmentConservationAnnotation() != null),
+ ap.getSeqPanel().seqCanvas.getFeatureRenderer());
setBoxPosition();
}
*/
private void setBoxPosition()
{
- od.setBoxPosition(av.getAlignment().getHiddenSequences(), av
- .getAlignment().getHiddenColumns());
+ od.setBoxPosition(av.getAlignment().getHiddenSequences(),
+ av.getAlignment().getHiddenColumns());
repaint();
}