X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FOverviewPanel.java;h=9cfda3a6026c3ec1893fddca07200aad27b74f72;hb=8df2de111af18978bb5254650cab7ba28bc84e82;hp=0d5c1233362b2d5c1073306f5e165fcc523f1925;hpb=26501f76ef450657c530de489b8404356a98aca3;p=jalview.git diff --git a/src/jalview/gui/OverviewPanel.java b/src/jalview/gui/OverviewPanel.java index 0d5c123..9cfda3a 100755 --- a/src/jalview/gui/OverviewPanel.java +++ b/src/jalview/gui/OverviewPanel.java @@ -20,18 +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.Rectangle; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.ComponentAdapter; @@ -48,6 +40,14 @@ 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. @@ -55,43 +55,50 @@ import javax.swing.SwingUtilities; * @author $author$ * @version $Revision$ */ +@SuppressWarnings("serial") public class OverviewPanel extends JPanel implements Runnable, ViewportListenerI { - 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 { @@ -170,22 +177,23 @@ public class OverviewPanel extends JPanel @Override public void mouseMoved(MouseEvent evt) { - if (!draggingBox) - // don't bother changing the cursor if we're dragging the box - // as we can't have moved inside or out of the box in that case + if (od.isPositionInBox(evt.getX(), evt.getY())) { - 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)); - } + /* + * 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.CROSSHAIR_CURSOR)); } } + }); addMouseListener(new MouseAdapter() @@ -193,36 +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; } - 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())) { - // 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; + draggingBox = false; - // display drag cursor at mouse position - setCursor(Cursor.getPredefinedCursor(Cursor.MOVE_CURSOR)); + // display drag cursor at mouse position + setCursor(Cursor.getPredefinedCursor(Cursor.MOVE_CURSOR)); - 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()); - } + od.updateViewportFromMouse(evt.getX(), evt.getY(), + av.getAlignment().getHiddenSequences(), + av.getAlignment().getHiddenColumns()); + getParent().setCursor( + Cursor.getPredefinedCursor(Cursor.HAND_CURSOR)); + } + else + { + draggingBox = true; + od.setDragPoint(evt.getX(), evt.getY(), + av.getAlignment().getHiddenSequences(), + av.getAlignment().getHiddenColumns()); } } @@ -247,13 +257,16 @@ public class OverviewPanel extends JPanel * Javascript does not call componentResized on initial display, * so do the update here */ - /** @j2sNative this.updateOverviewImage(); */ + 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() @@ -278,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) { @@ -317,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())); @@ -330,7 +343,6 @@ public class OverviewPanel extends JPanel thread.start(); repaint(); - } @Override @@ -401,8 +413,7 @@ 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); + internalFrame.setClosed(true); } catch (PropertyVetoException e) { // ignore @@ -413,6 +424,62 @@ 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(); + } + + /** + * Overridden to set the bounds of the frame holding the Overview panel + * + * @param xpos + * @param ypos + * @param width + * @param height + */ + @Override + public void setBounds(int xpos, int ypos, int width, int height) + { + internalFrame.setBounds(xpos, ypos, width, height); + } + + /** + * Overridden to return the bounds of the enclosing frame + * + * @return + */ + @Override + public Rectangle getBounds() + { + return internalFrame.getBounds(); + } }