X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FOverviewPanel.java;h=3c94f26654d8cc0ffda22ee5b54ac987e98299a3;hb=e04bcd38992def511190a30f98cb3db3a720e0fc;hp=01ca97899a390a9b4c4b788a477943b33d69e5b3;hpb=e5b6a315d9cffef8b66a8be031c4cdb542fb3a6e;p=jalview.git diff --git a/src/jalview/gui/OverviewPanel.java b/src/jalview/gui/OverviewPanel.java index 01ca978..3c94f26 100755 --- a/src/jalview/gui/OverviewPanel.java +++ b/src/jalview/gui/OverviewPanel.java @@ -20,17 +20,30 @@ */ package jalview.gui; +import jalview.bin.Cache; +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.event.ActionEvent; +import java.awt.event.ActionListener; import java.awt.event.ComponentAdapter; 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.JCheckBoxMenuItem; import javax.swing.JPanel; +import javax.swing.JPopupMenu; +import javax.swing.SwingUtilities; /** * Panel displaying an overview of the full alignment, with an interactive box @@ -39,7 +52,8 @@ import javax.swing.JPanel; * @author $author$ * @version $Revision$ */ -public class OverviewPanel extends JPanel implements Runnable +public class OverviewPanel extends JPanel + implements Runnable, ViewportListenerI { private OverviewDimensions od; @@ -49,6 +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. * @@ -60,12 +80,29 @@ public class OverviewPanel extends JPanel implements Runnable this.av = alPanel.av; this.ap = alPanel; - od = new OverviewDimensions(av.getRanges(), av.isShowAnnotation()); + 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)); + } - oviewCanvas = new OverviewCanvas(od, av, ap, this); + 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 @@ -75,6 +112,7 @@ public class OverviewPanel extends JPanel implements Runnable || (getHeight() != (od.getHeight()))) { updateOverviewImage(); + setBoxPosition(); } } }); @@ -84,12 +122,37 @@ public class OverviewPanel extends JPanel implements Runnable @Override public void mouseDragged(MouseEvent evt) { - if (!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())) + { + // display drag cursor at mouse position + setCursor(Cursor.getPredefinedCursor(Cursor.MOVE_CURSOR)); + } + else { - od.updateViewportFromMouse(evt.getX(), evt.getY(), av - .getAlignment().getHiddenSequences(), av - .getColumnSelection(), av.getRanges()); - ap.setScrollValues(od.getScrollCol(), od.getScrollRow()); + // reset cursor + setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR)); } } }); @@ -99,12 +162,49 @@ public class OverviewPanel extends JPanel implements Runnable @Override public void mousePressed(MouseEvent evt) { - if (!av.getWrapAlignment()) + if (SwingUtilities.isRightMouseButton(evt)) { - od.updateViewportFromMouse(evt.getX(), evt.getY(), av - .getAlignment().getHiddenSequences(), av - .getColumnSelection(), av.getRanges()); - ap.setScrollValues(od.getScrollCol(), od.getScrollRow()); + if (!Platform.isAMac()) + { + showPopupMenu(evt); + } + } + 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) + { + draggingBox = false; + } + } + + @Override + public void mouseClicked(MouseEvent evt) + { + if (SwingUtilities.isRightMouseButton(evt)) + { + showPopupMenu(evt); } } }); @@ -112,19 +212,68 @@ public class OverviewPanel extends JPanel implements Runnable updateOverviewImage(); } + /* + * Displays the popup menu and acts on user input + */ + private void showPopupMenu(MouseEvent e) + { + JPopupMenu popup = new JPopupMenu(); + ActionListener menuListener = new ActionListener() + { + @Override + public void actionPerformed(ActionEvent event) + { + // switch on/off the hidden columns view + toggleHiddenColumns(); + displayToggle.setSelected(showHidden); + } + }; + 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 OverviewDimensionsHideHidden(av.getRanges(), + (av.isShowAnnotation() + && av.getAlignmentConservationAnnotation() != null)); + } + else + { + showHidden = true; + od = new OverviewDimensionsShowHidden(av.getRanges(), + (av.isShowAnnotation() + && av.getAlignmentConservationAnnotation() != null)); + } + oviewCanvas.resetOviewDims(od); + updateOverviewImage(); + setBoxPosition(); + } + /** * Updates the overview image when the related alignment panel is updated */ public void updateOverviewImage() { - if (oviewCanvas.resizing) + if (oviewCanvas == null) { - oviewCanvas.resizeAgain = true; + /* + * panel has been disposed + */ return; } - oviewCanvas.resizing = true; - if ((getWidth() > 0) && (getHeight() > 0)) { od.setWidth(getWidth()); @@ -133,6 +282,11 @@ public class OverviewPanel extends JPanel implements Runnable setPreferredSize(new Dimension(od.getWidth(), od.getHeight())); + if (oviewCanvas.restartDraw()) + { + return; + } + Thread thread = new Thread(this); thread.start(); repaint(); @@ -141,7 +295,10 @@ public class OverviewPanel extends JPanel implements Runnable @Override public void run() { - oviewCanvas.draw(av.isShowSequenceFeatures(), av.isShowAnnotation()); + oviewCanvas.draw(av.isShowSequenceFeatures(), + (av.isShowAnnotation() + && av.getAlignmentConservationAnnotation() != null), + ap.getSeqPanel().seqCanvas.getFeatureRenderer()); setBoxPosition(); } @@ -150,10 +307,33 @@ 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 + { + av = null; + oviewCanvas = null; + ap = null; + od = null; + } + } }