X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FScalePanel.java;h=90f7cd2fd98f92f788a2a0ec88645104ac175334;hb=268dfe33ea14bbcdfb0671a1ec8acc5e9c423426;hp=bb2e0d7e07bbc86d74848b947e4913e38406f58a;hpb=e2227e5cbd0772e74c24f9e5420a8427fae5ddac;p=jalview.git diff --git a/src/jalview/gui/ScalePanel.java b/src/jalview/gui/ScalePanel.java index bb2e0d7..90f7cd2 100755 --- a/src/jalview/gui/ScalePanel.java +++ b/src/jalview/gui/ScalePanel.java @@ -21,6 +21,7 @@ package jalview.gui; import jalview.datamodel.ColumnSelection; +import jalview.datamodel.HiddenColumns; import jalview.datamodel.SequenceGroup; import jalview.datamodel.SequenceI; import jalview.renderer.ScaleRenderer; @@ -43,6 +44,7 @@ import java.util.List; import javax.swing.JMenuItem; import javax.swing.JPanel; import javax.swing.JPopupMenu; +import javax.swing.SwingUtilities; import javax.swing.ToolTipManager; /** @@ -100,12 +102,12 @@ public class ScalePanel extends JPanel implements MouseMotionListener, @Override public void mousePressed(MouseEvent evt) { - int x = (evt.getX() / av.getCharWidth()) + av.getStartRes(); + int x = (evt.getX() / av.getCharWidth()) + av.getRanges().getStartRes(); final int res; if (av.hasHiddenColumns()) { - x = av.getColumnSelection().adjustForHiddenColumns(x); + x = av.getAlignment().getHiddenColumns().adjustForHiddenColumns(x); } if (x >= av.getAlignment().getWidth()) @@ -124,6 +126,15 @@ public class ScalePanel extends JPanel implements MouseMotionListener, { rightMouseButtonPressed(evt, res); } + else if (SwingUtilities.isRightMouseButton(evt) && !Platform.isAMac()) + { + /* + * defer right-mouse click handling to mouse up on Windows + * (where isPopupTrigger() will answer true) + * but accept Cmd-click on Mac which passes isRightMouseButton + */ + return; + } else { leftMouseButtonPressed(evt, res); @@ -162,7 +173,7 @@ public class ScalePanel extends JPanel implements MouseMotionListener, }); pop.add(item); - if (av.getColumnSelection().hasHiddenColumns()) + if (av.getAlignment().getHiddenColumns().hasHiddenColumns()) { item = new JMenuItem(MessageManager.getString("action.reveal_all")); item.addActionListener(new ActionListener() @@ -222,6 +233,11 @@ public class ScalePanel extends JPanel implements MouseMotionListener, */ protected void leftMouseButtonPressed(MouseEvent evt, final int res) { + /* + * Ctrl-click/Cmd-click adds to the selection + * Shift-click extends the selection + */ + // TODO Problem: right-click on Windows not reported until mouseReleased?!? if (!Platform.isControlDown(evt) && !evt.isShiftDown()) { av.getColumnSelection().clear(); @@ -267,11 +283,13 @@ public class ScalePanel extends JPanel implements MouseMotionListener, { mouseDragging = false; - int res = (evt.getX() / av.getCharWidth()) + av.getStartRes(); + int res = (evt.getX() / av.getCharWidth()) + + av.getRanges().getStartRes(); if (av.hasHiddenColumns()) { - res = av.getColumnSelection().adjustForHiddenColumns(res); + res = av.getAlignment().getHiddenColumns() + .adjustForHiddenColumns(res); } if (res >= av.getAlignment().getWidth()) @@ -311,77 +329,31 @@ public class ScalePanel extends JPanel implements MouseMotionListener, } /** - * DOCUMENT ME! + * 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) * * @param evt - * DOCUMENT ME! */ @Override public void mouseDragged(MouseEvent evt) { mouseDragging = true; + ColumnSelection cs = av.getColumnSelection(); + HiddenColumns hidden = av.getAlignment().getHiddenColumns(); - int res = (evt.getX() / av.getCharWidth()) + av.getStartRes(); - if (res < 0) - { - res = 0; - } - - if (av.hasHiddenColumns()) - { - res = av.getColumnSelection().adjustForHiddenColumns(res); - } - - if (res >= av.getAlignment().getWidth()) - { - res = av.getAlignment().getWidth() - 1; - } - - if (res < min) - { - min = res; - } - - if (res > max) - { - max = res; - } + 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); + max = Math.max(res, max); SequenceGroup sg = av.getSelectionGroup(); - if (sg != null) { stretchingGroup = true; - - if (!av.getColumnSelection().contains(res)) - { - av.getColumnSelection().addElement(res); - } - - if (res > sg.getStartRes()) - { - sg.setEndRes(res); - } - if (res < sg.getStartRes()) - { - sg.setStartRes(res); - } - - int col; - for (int i = min; i <= max; i++) - { - col = i; // av.getColumnSelection().adjustForHiddenColumns(i); - - if ((col < sg.getStartRes()) || (col > sg.getEndRes())) - { - av.getColumnSelection().removeElement(col); - } - else - { - av.getColumnSelection().addElement(col); - } - } - + cs.stretchGroup(res, sg, min, max); ap.paintAlignment(false); } } @@ -409,6 +381,9 @@ public class ScalePanel extends JPanel implements MouseMotionListener, { } + /** + * Creates a tooltip when the mouse is over a hidden columns marker + */ @Override public void mouseMoved(MouseEvent evt) { @@ -419,13 +394,15 @@ public class ScalePanel extends JPanel implements MouseMotionListener, return; } - int res = (evt.getX() / av.getCharWidth()) + av.getStartRes(); + int res = (evt.getX() / av.getCharWidth()) + + av.getRanges().getStartRes(); - res = av.getColumnSelection().adjustForHiddenColumns(res); + res = av.getAlignment().getHiddenColumns().adjustForHiddenColumns(res); - if (av.getColumnSelection().getHiddenColumns() != null) + if (av.getAlignment().getHiddenColumns().getHiddenRegions() != null) { - for (int[] region : av.getColumnSelection().getHiddenColumns()) + for (int[] region : av.getAlignment().getHiddenColumns() + .getHiddenRegions()) { if (res + 1 == region[0] || res - 1 == region[1]) { @@ -433,11 +410,11 @@ public class ScalePanel extends JPanel implements MouseMotionListener, ToolTipManager.sharedInstance().registerComponent(this); this.setToolTipText(MessageManager .getString("label.reveal_hidden_columns")); - break; + repaint(); + return; } } } - repaint(); } /** @@ -449,7 +426,8 @@ public class ScalePanel extends JPanel implements MouseMotionListener, @Override public void paintComponent(Graphics g) { - drawScale(g, av.getStartRes(), av.getEndRes(), getWidth(), getHeight()); + drawScale(g, av.getRanges().getStartRes(), av.getRanges().getEndRes(), + getWidth(), getHeight()); } // scalewidth will normally be screenwidth, @@ -472,7 +450,9 @@ public class ScalePanel extends JPanel implements MouseMotionListener, // Fill the selected columns ColumnSelection cs = av.getColumnSelection(); - int avCharWidth = av.getCharWidth(), avCharHeight = av.getCharHeight(); + HiddenColumns hidden = av.getAlignment().getHiddenColumns(); + int avCharWidth = av.getCharWidth(); + int avCharHeight = av.getCharHeight(); if (cs != null) { @@ -485,9 +465,9 @@ public class ScalePanel extends JPanel implements MouseMotionListener, if (av.hasHiddenColumns()) { - if (cs.isVisible(sel)) + if (hidden.isVisible(sel)) { - sel = cs.findColumnPosition(sel); + sel = hidden.findColumnPosition(sel); } else { @@ -514,13 +494,13 @@ public class ScalePanel extends JPanel implements MouseMotionListener, // draw any hidden column markers gg.setColor(Color.blue); int res; - if (av.getShowHiddenMarkers() - && av.getColumnSelection().getHiddenColumns() != null) + + if (av.getShowHiddenMarkers() && hidden.getHiddenRegions() != null) { - for (int i = 0; i < av.getColumnSelection().getHiddenColumns() + for (int i = 0; i < hidden.getHiddenRegions() .size(); i++) { - res = av.getColumnSelection().findHiddenRegionPosition(i) + res = hidden.findHiddenRegionPosition(i) - startx; if (res < 0 || res > widthx)