X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FIdPanel.java;h=113fd9f2dd7d14454aab158c9ba986de9f939338;hb=7e00183505bd4c58d1ce62ee121ed372c3b058f2;hp=6aad6c5d753b2ed4925728ce01f2691df9480a3c;hpb=ad15cff29620f960119f80176f1fd443da9f6763;p=jalview.git diff --git a/src/jalview/gui/IdPanel.java b/src/jalview/gui/IdPanel.java index 6aad6c5..113fd9f 100755 --- a/src/jalview/gui/IdPanel.java +++ b/src/jalview/gui/IdPanel.java @@ -20,13 +20,17 @@ */ package jalview.gui; +import jalview.datamodel.AlignmentAnnotation; import jalview.datamodel.Sequence; import jalview.datamodel.SequenceFeature; import jalview.datamodel.SequenceGroup; import jalview.datamodel.SequenceI; +import jalview.gui.SeqPanel.MousePos; import jalview.io.SequenceAnnotationReport; import jalview.util.MessageManager; -import jalview.util.UrlLink; +import jalview.util.Platform; +import jalview.viewmodel.AlignmentViewport; +import jalview.viewmodel.ViewportRanges; import java.awt.BorderLayout; import java.awt.event.MouseEvent; @@ -35,10 +39,9 @@ import java.awt.event.MouseMotionListener; import java.awt.event.MouseWheelEvent; import java.awt.event.MouseWheelListener; import java.util.List; -import java.util.Vector; -import javax.swing.JOptionPane; import javax.swing.JPanel; +import javax.swing.JPopupMenu; import javax.swing.SwingUtilities; import javax.swing.ToolTipManager; @@ -49,12 +52,12 @@ import javax.swing.ToolTipManager; * @author $author$ * @version $Revision$ */ -public class IdPanel extends JPanel implements MouseListener, - MouseMotionListener, MouseWheelListener +public class IdPanel extends JPanel + implements MouseListener, MouseMotionListener, MouseWheelListener { private IdCanvas idCanvas; - protected AlignViewport av; + protected AlignmentViewport av; protected AlignmentPanel alignPanel; @@ -93,27 +96,46 @@ public class IdPanel extends JPanel implements MouseListener, } /** - * Respond to mouse movement by constructing tooltip text for the sequence id - * under the mouse. + * Responds to mouse movement by setting tooltip text for the sequence id + * under the mouse (or possibly annotation label, when in wrapped mode) * * @param e - * DOCUMENT ME! */ @Override public void mouseMoved(MouseEvent e) { SeqPanel sp = alignPanel.getSeqPanel(); - int seq = Math.max(0, sp.findSeq(e)); - if (seq > -1 && seq < av.getAlignment().getHeight()) - { - SequenceI sequence = av.getAlignment().getSequenceAt(seq); - StringBuffer tip = new StringBuffer(64); - seqAnnotReport - .createSequenceAnnotationReport(tip, sequence, - av.isShowDbRefs(), av.isShowNpFeats(), - sp.seqCanvas.fr.getMinMax()); - setToolTipText("" + sequence.getDisplayId(true) + " " - + tip.toString() + ""); + MousePos pos = sp.findMousePosition(e); + if (pos.isOverAnnotation()) + { + /* + * mouse is over an annotation label in wrapped mode + */ + AlignmentAnnotation[] anns = av.getAlignment() + .getAlignmentAnnotation(); + AlignmentAnnotation annotation = anns[pos.annotationIndex]; + setToolTipText(AnnotationLabels.getTooltip(annotation)); + alignPanel.alignFrame.setStatus( + AnnotationLabels.getStatusMessage(annotation, anns)); + } + else + { + int seq = Math.max(0, pos.seqIndex); + if (seq < av.getAlignment().getHeight()) + { + SequenceI sequence = av.getAlignment().getSequenceAt(seq); + StringBuilder tip = new StringBuilder(64); + tip.append(sequence.getDisplayId(true)).append(" "); + seqAnnotReport.createTooltipAnnotationReport(tip, sequence, + av.isShowDBRefs(), av.isShowNPFeats(), sp.seqCanvas.fr); + setToolTipText(JvSwingUtils.wrapTooltip(true, tip.toString())); + + StringBuilder text = new StringBuilder(); + text.append("Sequence ").append(String.valueOf(seq + 1)) + .append(" ID: ") + .append(sequence.getName()); + alignPanel.alignFrame.setStatus(text.toString()); + } } } @@ -128,7 +150,14 @@ public class IdPanel extends JPanel implements MouseListener, { mouseDragging = true; - int seq = Math.max(0, alignPanel.getSeqPanel().findSeq(e)); + MousePos pos = alignPanel.getSeqPanel().findMousePosition(e); + if (pos.isOverAnnotation()) + { + // mouse is over annotation label in wrapped mode + return; + } + + int seq = Math.max(0, pos.seqIndex); if (seq < lastid) { @@ -140,7 +169,7 @@ public class IdPanel extends JPanel implements MouseListener, } lastid = seq; - alignPanel.paintAlignment(true); + alignPanel.paintAlignment(false, false); } /** @@ -150,26 +179,27 @@ public class IdPanel extends JPanel implements MouseListener, public void mouseWheelMoved(MouseWheelEvent e) { e.consume(); - if (e.getWheelRotation() > 0) + double wheelRotation = e.getPreciseWheelRotation(); + if (wheelRotation > 0) { if (e.isShiftDown()) { - alignPanel.scrollRight(true); + av.getRanges().scrollRight(true); } else { - alignPanel.scrollUp(false); + av.getRanges().scrollUp(false); } } - else + else if (wheelRotation < 0) { if (e.isShiftDown()) { - alignPanel.scrollRight(false); + av.getRanges().scrollRight(false); } else { - alignPanel.scrollUp(true); + av.getRanges().scrollUp(true); } } } @@ -193,62 +223,30 @@ public class IdPanel extends JPanel implements MouseListener, */ if (e.getClickCount() < 2 || SwingUtilities.isRightMouseButton(e)) { + // reinstate isRightMouseButton check to ignore mouse-related popup events + // note - this does nothing on default MacBookPro force-trackpad config! return; } - Vector links = Preferences.sequenceURLLinks; - if (links == null || links.size() < 1) + MousePos pos = alignPanel.getSeqPanel().findMousePosition(e); + int seq = pos.seqIndex; + if (pos.isOverAnnotation() || seq < 0) { return; } - int seq = alignPanel.getSeqPanel().findSeq(e); - String url = null; - int i = 0; String id = av.getAlignment().getSequenceAt(seq).getName(); - while (url == null && i < links.size()) - { - // DEFAULT LINK IS FIRST IN THE LINK LIST - // BUT IF ITS A REGEX AND DOES NOT MATCH THE NEXT ONE WILL BE TRIED - url = links.elementAt(i++).toString(); - jalview.util.UrlLink urlLink = null; - try - { - urlLink = new UrlLink(url); - } catch (Exception foo) - { - jalview.bin.Cache.log.error("Exception for URLLink '" + url + "'", - foo); - url = null; - continue; - } - ; - if (!urlLink.isValid()) - { - jalview.bin.Cache.log.error(urlLink.getInvalidMessage()); - url = null; - continue; - } + String url = Preferences.sequenceUrlLinks.getPrimaryUrl(id); - String urls[] = urlLink.makeUrls(id, true); - if (urls == null || urls[0] == null || urls[0].length() < 4) - { - url = null; - continue; - } - // just take first URL made from regex - url = urls[1]; - } try { jalview.util.BrowserLauncher.openURL(url); } catch (Exception ex) { - JOptionPane - .showInternalMessageDialog( - Desktop.desktop, - MessageManager.getString("label.web_browser_not_found_unix"), - MessageManager.getString("label.web_browser_not_found"), JOptionPane.WARNING_MESSAGE); + JvOptionPane.showInternalMessageDialog(Desktop.desktop, + MessageManager.getString("label.web_browser_not_found_unix"), + MessageManager.getString("label.web_browser_not_found"), + JvOptionPane.WARNING_MESSAGE); ex.printStackTrace(); } } @@ -264,7 +262,7 @@ public class IdPanel extends JPanel implements MouseListener, { if (scrollThread != null) { - scrollThread.running = false; + scrollThread.stopScrolling(); } } @@ -282,13 +280,14 @@ public class IdPanel extends JPanel implements MouseListener, return; } - if (mouseDragging && (e.getY() < 0) && (av.getStartSeq() > 0)) + if (mouseDragging && (e.getY() < 0) + && (av.getRanges().getStartSeq() > 0)) { scrollThread = new ScrollThread(true); } if (mouseDragging && (e.getY() >= getHeight()) - && (av.getAlignment().getHeight() > av.getEndSeq())) + && (av.getAlignment().getHeight() > av.getRanges().getEndSeq())) { scrollThread = new ScrollThread(false); } @@ -315,40 +314,27 @@ public class IdPanel extends JPanel implements MouseListener, return; } - int seq = alignPanel.getSeqPanel().findSeq(e); - - if (SwingUtilities.isRightMouseButton(e)) + MousePos pos = alignPanel.getSeqPanel().findMousePosition(e); + + if (e.isPopupTrigger()) // Mac reports this in mousePressed { - Sequence sq = (Sequence) av.getAlignment().getSequenceAt(seq); - // build a new links menu based on the current links + any non-positional - // features - Vector nlinks = new Vector(Preferences.sequenceURLLinks); - SequenceFeature sf[] = sq == null ? null : sq.getDatasetSequence() - .getSequenceFeatures(); - for (int sl = 0; sf != null && sl < sf.length; sl++) - { - if (sf[sl].begin == sf[sl].end && sf[sl].begin == 0) - { - if (sf[sl].links != null && sf[sl].links.size() > 0) - { - for (int l = 0, lSize = sf[sl].links.size(); l < lSize; l++) - { - nlinks.addElement(sf[sl].links.elementAt(l)); - } - } - } - } - - jalview.gui.PopupMenu pop = new jalview.gui.PopupMenu(alignPanel, sq, - nlinks, new Vector(Preferences.getGroupURLLinks())); - pop.show(this, e.getX(), e.getY()); + showPopupMenu(e, pos); + return; + } + /* + * defer right-mouse click handling to mouseReleased on Windows + * (where isPopupTrigger() will answer true) + * NB isRightMouseButton is also true for Cmd-click on Mac + */ + if (SwingUtilities.isRightMouseButton(e) && !Platform.isAMac()) + { return; } if ((av.getSelectionGroup() == null) - || ((!e.isControlDown() && !e.isShiftDown()) && av - .getSelectionGroup() != null)) + || (!jalview.util.Platform.isControlDown(e) && !e.isShiftDown() + && av.getSelectionGroup() != null)) { av.setSelectionGroup(new SequenceGroup()); av.getSelectionGroup().setStartRes(0); @@ -357,13 +343,86 @@ public class IdPanel extends JPanel implements MouseListener, if (e.isShiftDown() && (lastid != -1)) { - selectSeqs(lastid, seq); + selectSeqs(lastid, pos.seqIndex); } else { - selectSeq(seq); + selectSeq(pos.seqIndex); } - alignPanel.paintAlignment(true); + + av.isSelectionGroupChanged(true); + + alignPanel.paintAlignment(false, false); + } + + /** + * Build and show the popup-menu at the right-click mouse position + * + * @param e + */ + void showPopupMenu(MouseEvent e, MousePos pos) + { + if (pos.isOverAnnotation()) + { + showAnnotationMenu(e, pos); + return; + } + + Sequence sq = (Sequence) av.getAlignment().getSequenceAt(pos.seqIndex); + + /* + * build a new links menu based on the current links + * and any non-positional features + */ + List features = null; + if (sq != null) + { + List nlinks = Preferences.sequenceUrlLinks.getLinksForMenu(); + features = sq.getFeatures().getNonPositionalFeatures(); + for (SequenceFeature sf : features) + { + if (sf.links != null) + { + nlinks.addAll(sf.links); + } + } + } + + PopupMenu pop = new PopupMenu(alignPanel, sq, features, + Preferences.getGroupURLLinks()); + pop.show(this, e.getX(), e.getY()); + } + + /** + * On right mouse click on a Consensus annotation label, shows a limited popup + * menu, with options to configure the consensus calculation and rendering. + * + * @param e + * @param pos + * @see AnnotationLabels#showPopupMenu(MouseEvent) + */ + void showAnnotationMenu(MouseEvent e, MousePos pos) + { + if (pos.annotationIndex == -1) + { + return; + } + AlignmentAnnotation[] anns = this.av.getAlignment() + .getAlignmentAnnotation(); + if (anns == null || pos.annotationIndex >= anns.length) + { + return; + } + AlignmentAnnotation ann = anns[pos.annotationIndex]; + if (!ann.label.contains("Consensus")) + { + return; + } + + JPopupMenu pop = new JPopupMenu( + MessageManager.getString("label.annotations")); + AnnotationLabels.addConsensusMenuOptions(this.alignPanel, ann, pop); + pop.show(this, e.getX(), e.getY()); } /** @@ -376,7 +435,7 @@ public class IdPanel extends JPanel implements MouseListener, lastid = seq; SequenceI pickedSeq = av.getAlignment().getSequenceAt(seq); - av.getSelectionGroup().addOrRemove(pickedSeq, true); + av.getSelectionGroup().addOrRemove(pickedSeq, false); } /** @@ -410,8 +469,8 @@ public class IdPanel extends JPanel implements MouseListener, for (int i = start; i <= end; i++) { - av.getSelectionGroup().addSequence( - av.getAlignment().getSequenceAt(i), i == end); + av.getSelectionGroup().addSequence(av.getAlignment().getSequenceAt(i), + false); } } @@ -426,13 +485,19 @@ public class IdPanel extends JPanel implements MouseListener, { if (scrollThread != null) { - scrollThread.running = false; + scrollThread.stopScrolling(); } + MousePos pos = alignPanel.getSeqPanel().findMousePosition(e); mouseDragging = false; PaintRefresher.Refresh(this, av.getSequenceSetId()); // always send selection message when mouse is released av.sendSelection(); + + if (e.isPopupTrigger()) // Windows reports this in mouseReleased + { + showPopupMenu(e, pos); + } } /** @@ -453,9 +518,10 @@ public class IdPanel extends JPanel implements MouseListener, int index = av.getAlignment().findIndex(list.get(0)); // do we need to scroll the panel? - if ((av.getStartSeq() > index) || (av.getEndSeq() < index)) + if ((av.getRanges().getStartSeq() > index) + || (av.getRanges().getEndSeq() < index)) { - alignPanel.setScrollValues(av.getStartRes(), index); + av.getRanges().setStartSeq(index); } } @@ -469,24 +535,42 @@ public class IdPanel extends JPanel implements MouseListener, this.idCanvas = idCanvas; } - // this class allows scrolling off the bottom of the visible alignment + /** + * Performs scrolling of the visible alignment up or down, adding newly + * visible sequences to the current selection + */ class ScrollThread extends Thread { - boolean running = false; + private boolean running = false; - boolean up = true; + private boolean up; + /** + * Constructor for a thread that scrolls either up or down + * + * @param up + */ public ScrollThread(boolean up) { this.up = up; + setName("IdPanel$ScrollThread$" + String.valueOf(up)); start(); } + /** + * Sets a flag to stop the scrolling + */ public void stopScrolling() { running = false; } + /** + * Scrolls the alignment either up or down, one row at a time, adding newly + * visible sequences to the current selection. Speed is limited to a maximum + * of ten rows per second. The thread exits when the end of the alignment is + * reached or a flag is set to stop it. + */ @Override public void run() { @@ -494,33 +578,24 @@ public class IdPanel extends JPanel implements MouseListener, while (running) { - if (alignPanel.scrollUp(up)) + ViewportRanges ranges = IdPanel.this.av.getRanges(); + if (ranges.scrollUp(up)) { - // scroll was ok, so add new sequence to selection - int seq = av.getStartSeq(); - - if (!up) - { - seq = av.getEndSeq(); - } - - if (seq < lastid) - { - selectSeqs(lastid - 1, seq); - } - else if (seq > lastid) - { - selectSeqs(lastid + 1, seq); - } - - lastid = seq; + int toSeq = up ? ranges.getStartSeq() : ranges.getEndSeq(); + int fromSeq = toSeq < lastid ? lastid - 1 : lastid + 1; + IdPanel.this.selectSeqs(fromSeq, toSeq); + + lastid = toSeq; } else { + /* + * scroll did nothing - reached limit of visible alignment + */ running = false; } - alignPanel.paintAlignment(false); + alignPanel.paintAlignment(false, false); try {