X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FOverviewPanel.java;h=5da4ae0a15b1ab62a6830833574fcbee514aa129;hb=747167089ecf8d6afc70d417f5a20352e029bd95;hp=567a1213f4b583c634b1429f76c7de952157fcc1;hpb=75aceeffea6e41f77a85ce6732780e760db739e5;p=jalview.git diff --git a/src/jalview/gui/OverviewPanel.java b/src/jalview/gui/OverviewPanel.java index 567a121..5da4ae0 100755 --- a/src/jalview/gui/OverviewPanel.java +++ b/src/jalview/gui/OverviewPanel.java @@ -20,6 +20,7 @@ */ package jalview.gui; +import jalview.api.AlignViewportI; import jalview.bin.Cache; import jalview.renderer.OverviewRenderer; import jalview.util.MessageManager; @@ -32,8 +33,6 @@ import jalview.viewmodel.ViewportListenerI; import java.awt.BorderLayout; import java.awt.Cursor; import java.awt.Dimension; -import java.awt.Image; -import java.awt.Point; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.ComponentAdapter; @@ -44,7 +43,6 @@ import java.awt.event.MouseMotionAdapter; import java.beans.PropertyChangeEvent; import java.beans.PropertyVetoException; -import javax.swing.ImageIcon; import javax.swing.JCheckBoxMenuItem; import javax.swing.JInternalFrame; import javax.swing.JPanel; @@ -58,55 +56,58 @@ import javax.swing.SwingUtilities; * @author $author$ * @version $Revision$ */ +@SuppressWarnings("serial") public class OverviewPanel extends JPanel implements Runnable, ViewportListenerI { - protected Image dragImage = new ImageIcon( - getClass().getResource("/images/dragcursor.png")) - .getImage(); - - private OverviewDimensions od; + protected OverviewDimensions od; private OverviewCanvas oviewCanvas; - private AlignViewport av; + private AlignViewportI av; private AlignmentPanel ap; - private JCheckBoxMenuItem displayToggle; + protected JCheckBoxMenuItem displayToggle; - private boolean showHidden = true; + protected boolean showHidden = true; - private boolean draggingBox = false; + protected boolean draggingBox = false; - private ProgressPanel progressPanel; + private Dimension dim; + + private boolean showProgress = !Platform.isJS(); + protected ProgressPanel progressPanel; + /** - * Creates a new OverviewPanel object. - * - * @param alPanel - * The alignment panel which is shown in the overview panel + * Creates the appropriate type of OverviewDimensions, with the desired size */ - public OverviewPanel(AlignmentPanel alPanel) + private void createOverviewDimensions() { - this.av = alPanel.av; - this.ap = alPanel; - - showHidden = Cache.getDefault(Preferences.SHOW_OV_HIDDEN_AT_START, - true); + boolean showAnnotation = (av.isShowAnnotation() + && av.getAlignmentConservationAnnotation() != null); if (showHidden) { - od = new OverviewDimensionsShowHidden(av.getRanges(), - (av.isShowAnnotation() - && av.getAlignmentConservationAnnotation() != null)); + od = new OverviewDimensionsShowHidden(av.getRanges(), showAnnotation, + dim); } else { - od = new OverviewDimensionsHideHidden(av.getRanges(), - (av.isShowAnnotation() - && av.getAlignmentConservationAnnotation() != null)); + od = new OverviewDimensionsHideHidden(av.getRanges(), showAnnotation, + dim); } + } + public OverviewPanel(AlignmentPanel alPanel, Dimension dim) + { + this.av = alPanel.av; + this.ap = alPanel; + this.dim = dim; + + showHidden = Cache.getDefault(Preferences.SHOW_OV_HIDDEN_AT_START, + false); + createOverviewDimensions(); setLayout(new BorderLayout()); progressPanel = new ProgressPanel(OverviewRenderer.UPDATE, MessageManager.getString("label.oview_calc"), getWidth()); @@ -119,22 +120,6 @@ public class OverviewPanel extends JPanel // without this the overview window does not size to fit the overview canvas setPreferredSize(new Dimension(od.getWidth(), od.getHeight())); - - // set up custom cursor for use on Mac... - Point hotSpot = new Point(16, 16); - String cursorName = "Custom drag cursor"; - - Cursor tempCursor; - if (Platform.isAMac()) - { - tempCursor = getToolkit().createCustomCursor(dragImage, hotSpot, - cursorName); - } - else - { - tempCursor = Cursor.getPredefinedCursor(Cursor.MOVE_CURSOR); - } - final Cursor dragCursor = tempCursor; addComponentListener(new ComponentAdapter() { @@ -195,14 +180,18 @@ public class OverviewPanel extends JPanel { if (od.isPositionInBox(evt.getX(), evt.getY())) { - // display drag cursor at mouse position - getParent().setCursor(dragCursor); + /* + * using HAND_CURSOR rather than DRAG_CURSOR + * as the latter is not supported on Mac + */ + getParent().setCursor( + Cursor.getPredefinedCursor(Cursor.HAND_CURSOR)); } else { // reset cursor getParent().setCursor( - Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR)); + Cursor.getPredefinedCursor(Cursor.CROSSHAIR_CURSOR)); } } @@ -213,24 +202,29 @@ public class OverviewPanel extends JPanel @Override public void mousePressed(MouseEvent evt) { - if (SwingUtilities.isRightMouseButton(evt)) - { - if (!Platform.isAMac()) - { - showPopupMenu(evt); - } + + if (Platform.isWinRightButton(evt)) { + showPopupMenu(evt); + return; + } + if (SwingUtilities.isRightMouseButton(evt)) { + return; } - else - { // 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; + + // display drag cursor at mouse position + setCursor(Cursor.getPredefinedCursor(Cursor.MOVE_CURSOR)); + od.updateViewportFromMouse(evt.getX(), evt.getY(), av.getAlignment().getHiddenSequences(), av.getAlignment().getHiddenColumns()); + getParent().setCursor( + Cursor.getPredefinedCursor(Cursor.HAND_CURSOR)); } else { @@ -239,7 +233,6 @@ public class OverviewPanel extends JPanel av.getAlignment().getHiddenSequences(), av.getAlignment().getHiddenColumns()); } - } } @Override @@ -249,26 +242,30 @@ public class OverviewPanel extends JPanel { showPopupMenu(evt); } - // click in box should also reset the cursor - else if (od.isPositionInBox(evt.getX(), evt.getY())) - { - // display drag cursor at mouse position - getParent().setCursor(dragCursor); - } - else - { - // reset cursor - getParent().setCursor( - Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR)); - } } + + @Override + public void mouseReleased(MouseEvent evt) + { + draggingBox = false; + } + }); + + /* + * Javascript does not call componentResized on initial display, + * so do the update here + */ + if (Platform.isJS()) + { + updateOverviewImage(); + } } /* * Displays the popup menu and acts on user input */ - private void showPopupMenu(MouseEvent e) + protected void showPopupMenu(MouseEvent e) { JPopupMenu popup = new JPopupMenu(); ActionListener menuListener = new ActionListener() @@ -293,22 +290,10 @@ public class OverviewPanel extends JPanel /* * Toggle overview display between showing hidden columns and hiding hidden columns */ - private void toggleHiddenColumns() + protected void toggleHiddenColumns() { - if (showHidden) - { - showHidden = false; - od = new OverviewDimensionsHideHidden(av.getRanges(), - (av.isShowAnnotation() - && av.getAlignmentConservationAnnotation() != null)); - } - else - { - showHidden = true; - od = new OverviewDimensionsShowHidden(av.getRanges(), - (av.isShowAnnotation() - && av.getAlignmentConservationAnnotation() != null)); - } + showHidden = !showHidden; + createOverviewDimensions(); oviewCanvas.resetOviewDims(od); updateOverviewImage(); setBoxPosition();