X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FOverviewPanel.java;h=872d142f3b552d475210909f127cdbcc9b3c574c;hb=a7bc89415a6749ff89eb97f75fbc950a433a4935;hp=567a1213f4b583c634b1429f76c7de952157fcc1;hpb=75aceeffea6e41f77a85ce6732780e760db739e5;p=jalview.git diff --git a/src/jalview/gui/OverviewPanel.java b/src/jalview/gui/OverviewPanel.java index 567a121..872d142 100755 --- a/src/jalview/gui/OverviewPanel.java +++ b/src/jalview/gui/OverviewPanel.java @@ -20,20 +20,10 @@ */ package jalview.gui; -import jalview.bin.Cache; -import jalview.renderer.OverviewRenderer; -import jalview.util.MessageManager; -import jalview.util.Platform; -import jalview.viewmodel.OverviewDimensions; -import jalview.viewmodel.OverviewDimensionsHideHidden; -import jalview.viewmodel.OverviewDimensionsShowHidden; -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.Rectangle; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.ComponentAdapter; @@ -44,13 +34,20 @@ 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; import javax.swing.JPopupMenu; import javax.swing.SwingUtilities; +import jalview.renderer.OverviewRenderer; +import jalview.util.MessageManager; +import jalview.util.Platform; +import jalview.viewmodel.OverviewDimensions; +import jalview.viewmodel.OverviewDimensionsHideHidden; +import jalview.viewmodel.OverviewDimensionsShowHidden; +import jalview.viewmodel.ViewportListenerI; + /** * Panel displaying an overview of the full alignment, with an interactive box * representing the viewport onto the alignment. @@ -58,47 +55,50 @@ 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; + protected AlignViewport av; private AlignmentPanel ap; - private JCheckBoxMenuItem displayToggle; + private JInternalFrame internalFrame; - private boolean showHidden = true; + protected JCheckBoxMenuItem displayToggle; - private boolean draggingBox = false; + protected boolean showHidden = true; - private ProgressPanel progressPanel; + protected boolean draggingBox = false; + + protected ProgressPanel progressPanel; /** * Creates a new OverviewPanel object. * * @param alPanel * The alignment panel which is shown in the overview panel + * @param frame + * @param isShowHidden + * TODO */ - public OverviewPanel(AlignmentPanel alPanel) + public OverviewPanel(AlignmentPanel alPanel, JInternalFrame frame, + boolean isShowHidden) { this.av = alPanel.av; this.ap = alPanel; + this.internalFrame = frame; - showHidden = Cache.getDefault(Preferences.SHOW_OV_HIDDEN_AT_START, - true); + showHidden = isShowHidden; if (showHidden) { od = new OverviewDimensionsShowHidden(av.getRanges(), - (av.isShowAnnotation() - && av.getAlignmentConservationAnnotation() != null)); + (av.isShowAnnotation() + && av.getAlignmentConservationAnnotation() != null)); } else { @@ -120,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() { @Override @@ -195,14 +179,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,32 +201,38 @@ public class OverviewPanel extends JPanel @Override public void mousePressed(MouseEvent evt) { + + if (Platform.isWinRightButton(evt)) + { + showPopupMenu(evt); + return; + } if (SwingUtilities.isRightMouseButton(evt)) { - if (!Platform.isAMac()) - { - showPopupMenu(evt); - } + return; + } + // 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 { - // 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()); - } + draggingBox = true; + od.setDragPoint(evt.getX(), evt.getY(), + av.getAlignment().getHiddenSequences(), + av.getAlignment().getHiddenColumns()); } } @@ -249,26 +243,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,7 +291,7 @@ public class OverviewPanel extends JPanel /* * Toggle overview display between showing hidden columns and hiding hidden columns */ - private void toggleHiddenColumns() + protected void toggleHiddenColumns() { if (showHidden) { @@ -332,7 +330,7 @@ public class OverviewPanel extends JPanel od.setWidth(getWidth()); od.setHeight(getHeight() - progressPanel.getHeight()); } - + setPreferredSize(new Dimension(od.getWidth(), od.getHeight() + progressPanel.getHeight())); @@ -345,7 +343,6 @@ public class OverviewPanel extends JPanel thread.start(); repaint(); - } @Override @@ -416,8 +413,9 @@ public class OverviewPanel extends JPanel * close the parent frame (which also removes it from the * Desktop Windows menu) */ - ((JInternalFrame) SwingUtilities.getAncestorOfClass( - JInternalFrame.class, (this))).setClosed(true); + ((JInternalFrame) SwingUtilities + .getAncestorOfClass(JInternalFrame.class, (this))) + .setClosed(true); } catch (PropertyVetoException e) { // ignore @@ -428,6 +426,68 @@ public class OverviewPanel extends JPanel oviewCanvas = null; ap = null; od = null; + internalFrame = null; } } + + public boolean isShowHiddenRegions() + { + return showHidden; + } + + public OverviewCanvas getCanvas() + { + return oviewCanvas; + } + + /** + * Sets the title of the enclosing frame + * + * @param title + */ + public void setTitle(String title) + { + internalFrame.setTitle(title); + } + + /** + * Returns the title of the enclosing frame + * + * @return title + */ + public String getTitle() + { + return internalFrame.getTitle(); + } + + /** + * Sets the bounds of the frame holding the Overview panel + * + * @param xpos + * @param ypos + * @param width + * @param height + */ + public void setFrameBounds(int xpos, int ypos, int width, int height) + { + internalFrame.setBounds(xpos, ypos, width, height); + } + + /** + * Returns the bounds of the enclosing frame + * + * @return + */ + public Rectangle getFrameBounds() + { + return internalFrame.getBounds(); + } + + /** + * Closes the frame containing the overview panel + */ + public void close() + { + internalFrame.dispose(); + } }