X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FOverviewPanel.java;h=74c21124ecfdf2d3f8d1ab2d0c4fb314a02bdc77;hb=62d2ca926e73609acc4c2a50676f2010c6e3e343;hp=8a416bd7a3138a2d65b40d32dd69b0582728878d;hpb=2feac6dabe64b144783f8538fab352e987eadcb6;p=jalview.git diff --git a/src/jalview/gui/OverviewPanel.java b/src/jalview/gui/OverviewPanel.java index 8a416bd..74c2112 100755 --- a/src/jalview/gui/OverviewPanel.java +++ b/src/jalview/gui/OverviewPanel.java @@ -20,13 +20,16 @@ */ package jalview.gui; +import jalview.renderer.OverviewRenderer; import jalview.util.MessageManager; import jalview.util.Platform; import jalview.viewmodel.OverviewDimensions; -import jalview.viewmodel.OverviewDimensionsAllVisible; -import jalview.viewmodel.OverviewDimensionsWithHidden; +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.event.ActionEvent; import java.awt.event.ActionListener; @@ -35,8 +38,9 @@ import java.awt.event.ComponentEvent; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.MouseMotionAdapter; +import java.beans.PropertyChangeEvent; -import javax.swing.JMenuItem; +import javax.swing.JCheckBoxMenuItem; import javax.swing.JPanel; import javax.swing.JPopupMenu; import javax.swing.SwingUtilities; @@ -48,7 +52,8 @@ import javax.swing.SwingUtilities; * @author $author$ * @version $Revision$ */ -public class OverviewPanel extends JPanel implements Runnable +public class OverviewPanel extends JPanel implements Runnable, + ViewportListenerI { private OverviewDimensions od; @@ -58,8 +63,14 @@ public class OverviewPanel extends JPanel implements Runnable private AlignmentPanel ap; + private JCheckBoxMenuItem displayToggle; + private boolean showHidden = true; + private boolean draggingBox = false; + + private ProgressPanel progressPanel; + /** * Creates a new OverviewPanel object. * @@ -71,25 +82,51 @@ public class OverviewPanel extends JPanel implements Runnable this.av = alPanel.av; this.ap = alPanel; - od = new OverviewDimensionsWithHidden(av.getRanges(), + od = new OverviewDimensionsShowHidden(av.getRanges(), (av.isShowAnnotation() && av .getAlignmentConservationAnnotation() != null)); - oviewCanvas = new OverviewCanvas(od, av); setLayout(new BorderLayout()); + progressPanel = new ProgressPanel(OverviewRenderer.UPDATE, + MessageManager.getString("label.oview_calc"), getWidth()); + this.add(progressPanel, BorderLayout.SOUTH); + oviewCanvas = new OverviewCanvas(od, av, progressPanel); + add(oviewCanvas, BorderLayout.CENTER); + av.getRanges().addPropertyChangeListener(this); + + // without this the overview window does not size to fit the overview canvas + setPreferredSize(new Dimension(od.getWidth(), od.getHeight())); + addComponentListener(new ComponentAdapter() { @Override public void componentResized(ComponentEvent evt) { - if ((getWidth() != od.getWidth()) - || (getHeight() != (od.getHeight()))) + // Resize is called on the initial display of the overview. + // This code adjusts sizes to account for the progress bar if it has not + // already been accounted for, which triggers another resize call for + // the correct sizing, at which point the overview image is updated. + // (This avoids a double recalculation of the image.) + if (getWidth() == od.getWidth() && getHeight() == od.getHeight() + + progressPanel.getHeight()) { updateOverviewImage(); } + else + { + if ((getWidth() > 0) && (getHeight() > 0)) + { + od.setWidth(getWidth()); + od.setHeight(getHeight() - progressPanel.getHeight()); + } + + setPreferredSize(new Dimension(od.getWidth(), + od.getHeight() + progressPanel.getHeight())); + } } + }); addMouseMotionListener(new MouseMotionAdapter() @@ -97,13 +134,37 @@ public class OverviewPanel extends JPanel implements Runnable @Override public void mouseDragged(MouseEvent evt) { - if (!SwingUtilities.isRightMouseButton(evt) - && !av.getWrapAlignment()) + if (!SwingUtilities.isRightMouseButton(evt)) + { + 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())) { - od.updateViewportFromMouse(evt.getX(), evt.getY(), av - .getAlignment().getHiddenSequences(), av - .getColumnSelection(), av.getRanges()); - ap.setScrollValues(od.getScrollCol(), od.getScrollRow()); + // display drag cursor at mouse position + setCursor(Cursor.getPredefinedCursor(Cursor.MOVE_CURSOR)); + } + else + { + // reset cursor + setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR)); } } }); @@ -120,12 +181,33 @@ public class OverviewPanel extends JPanel implements Runnable showPopupMenu(evt); } } - else if (!av.getWrapAlignment()) + else + { + 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 + 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()); + } + } + } + + @Override + public void mouseReleased(MouseEvent evt) + { + if (draggingBox) { - od.updateViewportFromMouse(evt.getX(), evt.getY(), av - .getAlignment().getHiddenSequences(), av - .getColumnSelection(), av.getRanges()); - ap.setScrollValues(od.getScrollCol(), od.getScrollRow()); + draggingBox = false; } } @@ -138,9 +220,6 @@ public class OverviewPanel extends JPanel implements Runnable } } }); - - - updateOverviewImage(); } /* @@ -156,33 +235,40 @@ public class OverviewPanel extends JPanel implements Runnable { // switch on/off the hidden columns view toggleHiddenColumns(); + displayToggle.setSelected(showHidden); } }; - JMenuItem item; - popup.add(item = new JMenuItem(MessageManager - .getString("label.togglehidden"))); - item.addActionListener(menuListener); + displayToggle = new JCheckBoxMenuItem( + MessageManager.getString("label.togglehidden")); + displayToggle.setEnabled(true); + displayToggle.setSelected(showHidden); + popup.add(displayToggle); + displayToggle.addActionListener(menuListener); popup.show(this, e.getX(), e.getY()); } + /* + * Toggle overview display between showing hidden columns and hiding hidden columns + */ private void toggleHiddenColumns() { if (showHidden) { showHidden = false; - od = new OverviewDimensionsAllVisible(av.getRanges(), + od = new OverviewDimensionsHideHidden(av.getRanges(), (av.isShowAnnotation() && av .getAlignmentConservationAnnotation() != null)); } else { showHidden = true; - od = new OverviewDimensionsWithHidden(av.getRanges(), + od = new OverviewDimensionsShowHidden(av.getRanges(), (av.isShowAnnotation() && av .getAlignmentConservationAnnotation() != null)); } oviewCanvas.resetOviewDims(od); updateOverviewImage(); + setBoxPosition(); } /** @@ -190,13 +276,22 @@ public class OverviewPanel extends JPanel implements Runnable */ public void updateOverviewImage() { + if (oviewCanvas == null) + { + /* + * panel has been disposed + */ + return; + } + if ((getWidth() > 0) && (getHeight() > 0)) { od.setWidth(getWidth()); - od.setHeight(getHeight()); + od.setHeight(getHeight() - progressPanel.getHeight()); } - - setPreferredSize(new Dimension(od.getWidth(), od.getHeight())); + + setPreferredSize(new Dimension(od.getWidth(), + od.getHeight() + progressPanel.getHeight())); if (oviewCanvas.restartDraw()) { @@ -207,6 +302,7 @@ public class OverviewPanel extends JPanel implements Runnable thread.start(); repaint(); + } @Override @@ -224,10 +320,34 @@ public class OverviewPanel extends JPanel implements Runnable * changed * */ - public void setBoxPosition() + private void setBoxPosition() { - od.setBoxPosition(av.getAlignment() - .getHiddenSequences(), av.getColumnSelection(), av.getRanges()); + od.setBoxPosition(av.getAlignment().getHiddenSequences(), av + .getAlignment().getHiddenColumns()); repaint(); } + + @Override + public void propertyChange(PropertyChangeEvent evt) + { + setBoxPosition(); + } + + /** + * Removes this object as a property change listener, and nulls references + */ + protected void dispose() + { + try + { + av.getRanges().removePropertyChangeListener(this); + } finally + { + progressPanel = null; + av = null; + oviewCanvas = null; + ap = null; + od = null; + } + } }