X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FOverviewPanel.java;h=3c94f26654d8cc0ffda22ee5b54ac987e98299a3;hb=e04bcd38992def511190a30f98cb3db3a720e0fc;hp=408eca683d5ab20393267efd02db355252a9a20c;hpb=536a4a9c407a4c07b71e86e75135eaa2ba5e8850;p=jalview.git diff --git a/src/jalview/gui/OverviewPanel.java b/src/jalview/gui/OverviewPanel.java index 408eca6..3c94f26 100755 --- a/src/jalview/gui/OverviewPanel.java +++ b/src/jalview/gui/OverviewPanel.java @@ -20,13 +20,16 @@ */ package jalview.gui; +import jalview.bin.Cache; 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,12 @@ public class OverviewPanel extends JPanel implements Runnable private AlignmentPanel ap; + private JCheckBoxMenuItem displayToggle; + private boolean showHidden = true; + private boolean draggingBox = false; + /** * Creates a new OverviewPanel object. * @@ -71,14 +80,29 @@ public class OverviewPanel extends JPanel implements Runnable this.av = alPanel.av; this.ap = alPanel; - od = new OverviewDimensionsWithHidden(av.getRanges(), - (av.isShowAnnotation() && av - .getAlignmentConservationAnnotation() != null)); + showHidden = Cache.getDefault(Preferences.SHOW_OV_HIDDEN_AT_START, + true); + if (showHidden) + { + od = new OverviewDimensionsShowHidden(av.getRanges(), + (av.isShowAnnotation() + && av.getAlignmentConservationAnnotation() != null)); + } + else + { + od = new OverviewDimensionsHideHidden(av.getRanges(), + (av.isShowAnnotation() + && av.getAlignmentConservationAnnotation() != null)); + } + + setSize(od.getWidth(), od.getHeight()); oviewCanvas = new OverviewCanvas(od, av); setLayout(new BorderLayout()); add(oviewCanvas, BorderLayout.CENTER); + av.getRanges().addPropertyChangeListener(this); + addComponentListener(new ComponentAdapter() { @Override @@ -88,6 +112,7 @@ public class OverviewPanel extends JPanel implements Runnable || (getHeight() != (od.getHeight()))) { updateOverviewImage(); + setBoxPosition(); } } }); @@ -97,13 +122,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.getAlignment() - .getHiddenColumns(), 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 +169,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.getAlignment() - .getHiddenColumns(), av.getRanges()); - ap.setScrollValues(od.getScrollCol(), od.getScrollRow()); + draggingBox = false; } } @@ -139,7 +209,6 @@ public class OverviewPanel extends JPanel implements Runnable } }); - updateOverviewImage(); } @@ -156,12 +225,15 @@ public class OverviewPanel extends JPanel implements Runnable { // switch on/off the hidden columns view toggleHiddenColumns(); + displayToggle.setSelected(showHidden); } }; - JMenuItem item = new JMenuItem( + displayToggle = new JCheckBoxMenuItem( MessageManager.getString("label.togglehidden")); - popup.add(item); - item.addActionListener(menuListener); + displayToggle.setEnabled(true); + displayToggle.setSelected(showHidden); + popup.add(displayToggle); + displayToggle.addActionListener(menuListener); popup.show(this, e.getX(), e.getY()); } @@ -173,19 +245,20 @@ public class OverviewPanel extends JPanel implements Runnable if (showHidden) { showHidden = false; - od = new OverviewDimensionsAllVisible(av.getRanges(), - (av.isShowAnnotation() && av - .getAlignmentConservationAnnotation() != null)); + od = new OverviewDimensionsHideHidden(av.getRanges(), + (av.isShowAnnotation() + && av.getAlignmentConservationAnnotation() != null)); } else { showHidden = true; - od = new OverviewDimensionsWithHidden(av.getRanges(), - (av.isShowAnnotation() && av - .getAlignmentConservationAnnotation() != null)); + od = new OverviewDimensionsShowHidden(av.getRanges(), + (av.isShowAnnotation() + && av.getAlignmentConservationAnnotation() != null)); } oviewCanvas.resetOviewDims(od); updateOverviewImage(); + setBoxPosition(); } /** @@ -193,6 +266,14 @@ 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()); @@ -209,16 +290,15 @@ public class OverviewPanel extends JPanel implements Runnable Thread thread = new Thread(this); thread.start(); repaint(); - } @Override 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(); } @@ -227,11 +307,33 @@ public class OverviewPanel extends JPanel implements Runnable * changed * */ - public void setBoxPosition() + private void setBoxPosition() { - od.setBoxPosition(av.getAlignment() -.getHiddenSequences(), av - .getAlignment().getHiddenColumns(), 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 + { + av = null; + oviewCanvas = null; + ap = null; + od = null; + } + } }