X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FScalePanel.java;h=b06647d1e850d2aab2340951a263165517ecc756;hb=9b0bf59c743413e08a272dae04d7347f1163e90b;hp=bf9ca8e05261c14351d87a7395433af94ab0fabf;hpb=a6789f8a91ca11fac840b958ee9207581ea4d14f;p=jalview.git diff --git a/src/jalview/gui/ScalePanel.java b/src/jalview/gui/ScalePanel.java index bf9ca8e..b06647d 100755 --- a/src/jalview/gui/ScalePanel.java +++ b/src/jalview/gui/ScalePanel.java @@ -23,7 +23,6 @@ package jalview.gui; import jalview.datamodel.ColumnSelection; import jalview.datamodel.HiddenColumns; import jalview.datamodel.SequenceGroup; -import jalview.datamodel.SequenceI; import jalview.renderer.ScaleRenderer; import jalview.renderer.ScaleRenderer.ScaleMark; import jalview.util.MessageManager; @@ -35,6 +34,7 @@ import java.awt.Color; import java.awt.FontMetrics; import java.awt.Graphics; import java.awt.Graphics2D; +import java.awt.Point; import java.awt.RenderingHints; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; @@ -48,13 +48,13 @@ import java.util.List; import javax.swing.JMenuItem; import javax.swing.JPanel; import javax.swing.JPopupMenu; -import javax.swing.SwingUtilities; import javax.swing.ToolTipManager; /** * The panel containing the sequence ruler (when not in wrapped mode), and * supports a range of mouse operations to select, hide or reveal columns. */ +@SuppressWarnings("serial") public class ScalePanel extends JPanel implements MouseMotionListener, MouseListener, ViewportListenerI { @@ -113,17 +113,9 @@ public class ScalePanel extends JPanel if (av.hasHiddenColumns()) { - x = av.getAlignment().getHiddenColumns().adjustForHiddenColumns(x); - } - - if (x >= av.getAlignment().getWidth()) - { - res = av.getAlignment().getWidth() - 1; - } - else - { - res = x; + x = av.getAlignment().getHiddenColumns().visibleToAbsoluteColumn(x); } + res = Math.min(x, av.getAlignment().getWidth() - 1); min = res; max = res; @@ -131,8 +123,9 @@ public class ScalePanel extends JPanel if (evt.isPopupTrigger()) // Mac: mousePressed { rightMouseButtonPressed(evt, res); + return; } - else if (SwingUtilities.isRightMouseButton(evt) && !Platform.isAMac()) + if (Platform.isWinRightButton(evt)) { /* * defer right-mouse click handling to mouse up on Windows @@ -141,10 +134,7 @@ public class ScalePanel extends JPanel */ return; } - else - { - leftMouseButtonPressed(evt, res); - } + leftMouseButtonPressed(evt, res); } /** @@ -157,8 +147,30 @@ public class ScalePanel extends JPanel */ protected void rightMouseButtonPressed(MouseEvent evt, final int res) { + JPopupMenu pop = buildPopupMenu(res); + if (pop.getSubElements().length > 0) + { + pop.show(this, evt.getX(), evt.getY()); + } + } + + /** + * Builds a popup menu with 'Hide' or 'Reveal' options, or both, or neither + * + * @param res + * column number (0..) + * @return + */ + protected JPopupMenu buildPopupMenu(final int res) + { JPopupMenu pop = new JPopupMenu(); - if (reveal != null) + + /* + * logic here depends on 'reveal', set in mouseMoved; + * grab the hidden range in case mouseMoved nulls it later + */ + final int[] hiddenRange = reveal; + if (hiddenRange != null) { JMenuItem item = new JMenuItem( MessageManager.getString("label.reveal")); @@ -167,15 +179,17 @@ public class ScalePanel extends JPanel @Override public void actionPerformed(ActionEvent e) { - av.showColumn(reveal[0]); + av.showColumn(hiddenRange[0]); reveal = null; - ap.paintAlignment(true); + ap.updateLayout(); + ap.paintAlignment(true, true); av.sendSelection(); } }); pop.add(item); - if (av.getAlignment().getHiddenColumns().hasManyHiddenColumns()) + if (av.getAlignment().getHiddenColumns() + .hasMultiHiddenColumnRegions()) { item = new JMenuItem(MessageManager.getString("action.reveal_all")); item.addActionListener(new ActionListener() @@ -185,15 +199,16 @@ public class ScalePanel extends JPanel { av.showAllHiddenColumns(); reveal = null; - ap.paintAlignment(true); + ap.updateLayout(); + ap.paintAlignment(true, true); av.sendSelection(); } }); pop.add(item); } - pop.show(this, evt.getX(), evt.getY()); } - else if (av.getColumnSelection().contains(res)) + + if (av.getColumnSelection().contains(res)) { JMenuItem item = new JMenuItem( MessageManager.getString("label.hide_columns")); @@ -209,13 +224,14 @@ public class ScalePanel extends JPanel av.setSelectionGroup(null); } - ap.paintAlignment(true); + ap.updateLayout(); + ap.paintAlignment(true, true); av.sendSelection(); } }); pop.add(item); - pop.show(this, evt.getX(), evt.getY()); } + return pop; } /** @@ -237,15 +253,7 @@ public class ScalePanel extends JPanel } av.getColumnSelection().addElement(res); - SequenceGroup sg = new SequenceGroup(); - // try to be as quick as possible - SequenceI[] iVec = av.getAlignment().getSequencesArray(); - for (int i = 0; i < iVec.length; i++) - { - sg.addSequence(iVec[i], false); - iVec[i] = null; - } - iVec = null; + SequenceGroup sg = new SequenceGroup(av.getAlignment().getSequences()); sg.setStartRes(res); sg.setEndRes(res); @@ -261,34 +269,34 @@ public class ScalePanel extends JPanel sg.setEndRes(max); } av.setSelectionGroup(sg); - ap.paintAlignment(false); + ap.paintAlignment(false, false); av.sendSelection(); } /** - * DOCUMENT ME! + * Action on mouseUp is to set the limit of the current selection group (if + * there is one) and broadcast the selection * * @param evt - * DOCUMENT ME! */ @Override public void mouseReleased(MouseEvent evt) { + boolean wasDragging = mouseDragging; mouseDragging = false; + ap.getSeqPanel().stopScrolling(); - int res = (evt.getX() / av.getCharWidth()) - + av.getRanges().getStartRes(); - + // todo res calculation should be a method on AlignViewport + int xCords = Math.max(0, evt.getX()); // prevent negative X coordinates + ViewportRanges ranges = av.getRanges(); + int res = (xCords / av.getCharWidth()) + ranges.getStartRes(); + res = Math.min(res, ranges.getEndRes()); if (av.hasHiddenColumns()) { res = av.getAlignment().getHiddenColumns() - .adjustForHiddenColumns(res); - } - - if (res >= av.getAlignment().getWidth()) - { - res = av.getAlignment().getWidth() - 1; + .visibleToAbsoluteColumn(res); } + res = Math.max(0, res); if (!stretchingGroup) { @@ -298,7 +306,7 @@ public class ScalePanel extends JPanel } else { - ap.paintAlignment(false); + ap.paintAlignment(false, false); } return; } @@ -315,15 +323,26 @@ public class ScalePanel extends JPanel { sg.setStartRes(res); } + if (wasDragging) + { + min = Math.min(res, min); + max = Math.max(res, max); + av.getColumnSelection().stretchGroup(res, sg, min, max); + } } stretchingGroup = false; - ap.paintAlignment(false); + ap.paintAlignment(false, false); + av.isSelectionGroupChanged(true); + av.isColSelChanged(true); av.sendSelection(); } /** * Action on dragging the mouse in the scale panel is to expand or shrink the - * selection group range (including any hidden columns that it spans) + * selection group range (including any hidden columns that it spans). Note + * that the selection is only broadcast at the start of the drag (on + * mousePressed) and at the end (on mouseReleased), to avoid overload + * redrawing of other views. * * @param evt */ @@ -337,7 +356,7 @@ public class ScalePanel extends JPanel int res = (evt.getX() / av.getCharWidth()) + av.getRanges().getStartRes(); res = Math.max(0, res); - res = hidden.adjustForHiddenColumns(res); + res = hidden.visibleToAbsoluteColumn(res); res = Math.min(res, av.getAlignment().getWidth() - 1); min = Math.min(res, min); max = Math.max(res, max); @@ -347,7 +366,7 @@ public class ScalePanel extends JPanel { stretchingGroup = true; cs.stretchGroup(res, sg, min, max); - ap.paintAlignment(false); + ap.paintAlignment(false, false); } } @@ -356,16 +375,23 @@ public class ScalePanel extends JPanel { if (mouseDragging) { - ap.getSeqPanel().scrollCanvas(null); + mouseDragging = false; + ap.getSeqPanel().stopScrolling(); } } + /** + * Action on leaving the panel bounds with mouse drag in progress is to start + * scrolling the alignment in the direction of the mouse. To restrict + * scrolling to left-right (not up-down), the y-value of the mouse position is + * replaced with zero. + */ @Override public void mouseExited(MouseEvent evt) { if (mouseDragging) { - ap.getSeqPanel().scrollCanvas(evt); + ap.getSeqPanel().startScrolling(new Point(evt.getX(), 0)); } } @@ -393,7 +419,7 @@ public class ScalePanel extends JPanel reveal = av.getAlignment().getHiddenColumns() .getRegionWithEdgeAtRes(res); - res = av.getAlignment().getHiddenColumns().adjustForHiddenColumns(res); + res = av.getAlignment().getHiddenColumns().visibleToAbsoluteColumn(res); ToolTipManager.sharedInstance().registerComponent(this); this.setToolTipText( @@ -410,6 +436,9 @@ public class ScalePanel extends JPanel @Override public void paintComponent(Graphics g) { + + // super.paintComponent(g); // BH 2019 + /* * shouldn't get called in wrapped mode as the scale above is * drawn instead by SeqCanvas.drawNorthScale @@ -458,7 +487,7 @@ public class ScalePanel extends JPanel { if (hidden.isVisible(sel)) { - sel = hidden.findColumnPosition(sel); + sel = hidden.absoluteToVisibleColumn(sel); } else { @@ -488,18 +517,19 @@ public class ScalePanel extends JPanel if (av.getShowHiddenMarkers()) { - Iterator it = hidden.getBoundedStartIterator(startx, - startx + widthx + 1, true); + Iterator it = hidden.getStartRegionIterator(startx, + startx + widthx + 1); while (it.hasNext()) { res = it.next() - startx; gg.fillPolygon( new int[] - { -1 + res * avCharWidth - avCharHeight / 4, - -1 + res * avCharWidth + avCharHeight / 4, - -1 + res * avCharWidth }, new int[] - { y, y, y + 2 * yOf }, 3); + { -1 + res * avCharWidth - avCharHeight / 4, + -1 + res * avCharWidth + avCharHeight / 4, + -1 + res * avCharWidth }, + new int[] + { y, y, y + 2 * yOf }, 3); } } } @@ -539,17 +569,36 @@ public class ScalePanel extends JPanel @Override public void propertyChange(PropertyChangeEvent evt) { - // Respond to viewport change events (e.g. alignment panel was scrolled) - // Both scrolling and resizing change viewport ranges: scrolling changes - // both start and end points, but resize only changes end values. - // Here we only want to fastpaint on a scroll, with resize using a normal - // paint, so scroll events are identified as changes to the horizontal or - // vertical start value. - if (evt.getPropertyName().equals(ViewportRanges.STARTRES)) + switch (evt.getPropertyName()) { + case ViewportRanges.STARTRES: + case ViewportRanges.STARTRESANDSEQ: + case ViewportRanges.MOVE_VIEWPORT: // scroll event, repaint panel - repaint(); + // original comment: + // Call repaint on alignment panel so that repaints from other alignment + // panel components can be aggregated. Otherwise performance of the + // overview + // window and others may be adversely affected. + + // TODO: check this? + // BH: This is actually quite strange. AlignmentPanel is taking care of + // all of this with fast paint, so why indirectly trigger a repaint from + // the ScalePanel? Where do we see this behavior necessary? + // I have set this to check for a trigger from some other ViewportRanges, + // but I don't actually think that is possible. + + if (evt.getSource() != av.getRanges()) + { + av.getAlignPanel().repaint(); + } + break; } } + public boolean isMouseDragging() + { + return mouseDragging; + } + }