X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FScalePanel.java;h=a186ce6af1044380efc24ff2f6453de300c66b59;hb=893f21fe8df6a9d47ced8140e3ba75f03407be00;hp=23108663b4b6c50f4e386811a0226a05d0dd762e;hpb=d5702bf3268c2688e90d645ec635ad5bb5d3a76e;p=jalview.git diff --git a/src/jalview/gui/ScalePanel.java b/src/jalview/gui/ScalePanel.java index 2310866..a186ce6 100755 --- a/src/jalview/gui/ScalePanel.java +++ b/src/jalview/gui/ScalePanel.java @@ -20,21 +20,11 @@ */ 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; -import jalview.util.Platform; -import jalview.viewmodel.ViewportListenerI; -import jalview.viewmodel.ViewportRanges; - 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,9 +38,18 @@ import java.util.List; import javax.swing.JMenuItem; import javax.swing.JPanel; import javax.swing.JPopupMenu; -import javax.swing.SwingUtilities; import javax.swing.ToolTipManager; +import jalview.datamodel.ColumnSelection; +import jalview.datamodel.HiddenColumns; +import jalview.datamodel.SequenceGroup; +import jalview.renderer.ScaleRenderer; +import jalview.renderer.ScaleRenderer.ScaleMark; +import jalview.util.MessageManager; +import jalview.util.Platform; +import jalview.viewmodel.ViewportListenerI; +import jalview.viewmodel.ViewportRanges; + /** * The panel containing the sequence ruler (when not in wrapped mode), and * supports a range of mouse operations to select, hide or reveal columns. @@ -108,22 +107,7 @@ public class ScalePanel extends JPanel @Override public void mousePressed(MouseEvent evt) { - int x = (evt.getX() / av.getCharWidth()) + av.getRanges().getStartRes(); - final int res; - - if (av.hasHiddenColumns()) - { - x = av.getAlignment().getHiddenColumns().adjustForHiddenColumns(x); - } - - if (x >= av.getAlignment().getWidth()) - { - res = av.getAlignment().getWidth() - 1; - } - else - { - res = x; - } + int res = ap.getSeqPanel().findAlignmentColumn(evt); min = res; max = res; @@ -131,8 +115,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 +126,7 @@ public class ScalePanel extends JPanel */ return; } - else - { - leftMouseButtonPressed(evt, res); - } + leftMouseButtonPressed(evt, res); } /** @@ -157,8 +139,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 +171,17 @@ public class ScalePanel extends JPanel @Override public void actionPerformed(ActionEvent e) { - av.showColumn(reveal[0]); + av.showColumn(hiddenRange[0]); reveal = null; + 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 +191,16 @@ public class ScalePanel extends JPanel { av.showAllHiddenColumns(); reveal = null; + 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 +216,14 @@ public class ScalePanel extends JPanel av.setSelectionGroup(null); } + ap.updateLayout(); ap.paintAlignment(true, true); av.sendSelection(); } }); pop.add(item); - pop.show(this, evt.getX(), evt.getY()); } + return pop; } /** @@ -237,15 +245,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); @@ -262,34 +262,25 @@ public class ScalePanel extends JPanel } av.setSelectionGroup(sg); ap.paintAlignment(false, false); + PaintRefresher.Refresh(this,av.getSequenceSetId()); 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(); - - if (av.hasHiddenColumns()) - { - res = av.getAlignment().getHiddenColumns() - .adjustForHiddenColumns(res); - } - - if (res >= av.getAlignment().getWidth()) - { - res = av.getAlignment().getWidth() - 1; - } - + int res = ap.getSeqPanel().findAlignmentColumn(evt); + if (!stretchingGroup) { if (evt.isPopupTrigger()) // Windows: mouseReleased @@ -315,31 +306,39 @@ 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, false); + av.isSelectionGroupChanged(true); + av.isColSelChanged(true); + PaintRefresher.Refresh(ap, av.getSequenceSetId()); 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 */ @Override public void mouseDragged(MouseEvent evt) { - mouseDragging = true; + mouseDragging = true; + int res = ap.getSeqPanel().findAlignmentColumn(evt); + ColumnSelection cs = av.getColumnSelection(); - HiddenColumns hidden = av.getAlignment().getHiddenColumns(); - - int res = (evt.getX() / av.getCharWidth()) - + av.getRanges().getStartRes(); - res = Math.max(0, res); - res = hidden.adjustForHiddenColumns(res); - res = Math.min(res, av.getAlignment().getWidth() - 1); - min = Math.min(res, min); + + min = Math.min(res,min); max = Math.max(res, max); SequenceGroup sg = av.getSelectionGroup(); @@ -348,6 +347,7 @@ public class ScalePanel extends JPanel stretchingGroup = true; cs.stretchGroup(res, sg, min, max); ap.paintAlignment(false, false); + PaintRefresher.Refresh(ap, av.getSequenceSetId()); } } @@ -356,16 +356,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)); } } @@ -382,25 +389,32 @@ public class ScalePanel extends JPanel { this.setToolTipText(null); reveal = null; - if (!av.hasHiddenColumns()) - { + final int res = ap.getSeqPanel().findAlignmentColumn(evt); + + highlightAllStructPos(res); + if (!av.hasHiddenColumns()) { return; } - - int res = (evt.getX() / av.getCharWidth()) - + av.getRanges().getStartRes(); - reveal = av.getAlignment().getHiddenColumns() - .getRegionWithEdgeAtRes(res); - - res = av.getAlignment().getHiddenColumns().adjustForHiddenColumns(res); - + .getRegionWithEdgeAtRes(av.getAlignment().getHiddenColumns().absoluteToVisibleColumn(res)); + if (reveal==null) + { + return; + } ToolTipManager.sharedInstance().registerComponent(this); this.setToolTipText( MessageManager.getString("label.reveal_hidden_columns")); repaint(); } + public void highlightAllStructPos(int col) + { + ap.getStructureSelectionManager().highlightPositionsOnMany( + ap.av.getAlignment().getSequencesArray(), new int[] + { col, col }, ap); + + } + /** * DOCUMENT ME! * @@ -410,6 +424,8 @@ 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 +474,7 @@ public class ScalePanel extends JPanel { if (hidden.isVisible(sel)) { - sel = hidden.findColumnPosition(sel); + sel = hidden.absoluteToVisibleColumn(sel); } else { @@ -488,7 +504,7 @@ public class ScalePanel extends JPanel if (av.getShowHiddenMarkers()) { - Iterator it = hidden.getBoundedStartIterator(startx, + Iterator it = hidden.getStartRegionIterator(startx, startx + widthx + 1); while (it.hasNext()) { @@ -496,10 +512,11 @@ public class ScalePanel extends JPanel 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); } } } @@ -550,7 +567,12 @@ public class ScalePanel extends JPanel || evt.getPropertyName().equals(ViewportRanges.MOVE_VIEWPORT)) { // scroll event, repaint panel - repaint(); + + // 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. + av.getAlignPanel().repaint(); } }