X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FIdPanel.java;h=8290dcf1d14515177557e449132411fd582c755d;hb=47ca18b4cfc7db54fc55a91fe5f0d61be989abf8;hp=32768b74160e828599be6bca3747e0a86764048d;hpb=b5a5b5fa7fe3fb77e55acf930d25d10ddc0e80e2;p=jalview.git diff --git a/src/jalview/gui/IdPanel.java b/src/jalview/gui/IdPanel.java index 32768b7..8290dcf 100755 --- a/src/jalview/gui/IdPanel.java +++ b/src/jalview/gui/IdPanel.java @@ -20,6 +20,7 @@ */ package jalview.gui; +import jalview.bin.Jalview; import jalview.datamodel.Sequence; import jalview.datamodel.SequenceFeature; import jalview.datamodel.SequenceGroup; @@ -28,8 +29,11 @@ import jalview.io.SequenceAnnotationReport; import jalview.util.MessageManager; import jalview.util.Platform; import jalview.viewmodel.AlignmentViewport; +import jalview.viewmodel.ViewportRanges; import java.awt.BorderLayout; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; import java.awt.event.MouseEvent; import java.awt.event.MouseListener; import java.awt.event.MouseMotionListener; @@ -39,6 +43,7 @@ import java.util.List; import javax.swing.JPanel; import javax.swing.SwingUtilities; +import javax.swing.Timer; import javax.swing.ToolTipManager; /** @@ -48,8 +53,8 @@ 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; @@ -108,8 +113,7 @@ public class IdPanel extends JPanel implements MouseListener, SequenceI sequence = av.getAlignment().getSequenceAt(seq); StringBuilder tip = new StringBuilder(64); seqAnnotReport.createTooltipAnnotationReport(tip, sequence, - av.isShowDBRefs(), av.isShowNPFeats(), - sp.seqCanvas.fr.getMinMax()); + av.isShowDBRefs(), av.isShowNPFeats(), sp.seqCanvas.fr); setToolTipText(JvSwingUtils.wrapTooltip(true, sequence.getDisplayId(true) + " " + tip.toString())); } @@ -138,7 +142,7 @@ public class IdPanel extends JPanel implements MouseListener, } lastid = seq; - alignPanel.paintAlignment(true); + alignPanel.paintAlignment(false, false); } /** @@ -148,26 +152,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); } } } @@ -214,17 +219,24 @@ public class IdPanel extends JPanel implements MouseListener, } /** - * DOCUMENT ME! + * On (re-)entering the panel, stop any scrolling * * @param e - * DOCUMENT ME! */ @Override public void mouseEntered(MouseEvent e) { + stopScrolling(); + } + + /** + * Interrupts the scroll thread if one is running + */ + void stopScrolling() + { if (scrollThread != null) { - scrollThread.running = false; + scrollThread.stopScrolling(); } } @@ -242,16 +254,70 @@ public class IdPanel extends JPanel implements MouseListener, return; } - if (mouseDragging && (e.getY() < 0) - && (av.getRanges().getStartSeq() > 0)) + if (mouseDragging) { - scrollThread = new ScrollThread(true); + /* + * on mouse drag above or below the panel, start + * scrolling if there are more sequences to show + */ + ViewportRanges ranges = av.getRanges(); + if (e.getY() < 0 && ranges.getStartSeq() > 0) + { + startScrolling(true); + } + else if (e.getY() >= getHeight() + && ranges.getEndSeq() <= av.getAlignment().getHeight()) + { + startScrolling(false); + } } + } - if (mouseDragging && (e.getY() >= getHeight()) - && (av.getAlignment().getHeight() > av.getRanges().getEndSeq())) + /** + * Starts scrolling either up or down + * + * @param up + */ + void startScrolling(boolean up) + { + scrollThread = new ScrollThread(up); + if (!Jalview.isJS()) + { + /* + * Java - run in a new thread + */ + scrollThread.start(); + } + else { - scrollThread = new ScrollThread(false); + /* + * for JalviewJS using Swing Timer + */ + Timer t = new Timer(20, new ActionListener() + { + @Override + public void actionPerformed(ActionEvent e) + { + if (scrollThread != null) + { + // if (!scrollOnce() {t.stop();}) gives compiler error :-( + scrollThread.scrollOnce(); + } + } + }); + t.addActionListener(new ActionListener() + { + @Override + public void actionPerformed(ActionEvent e) + { + if (scrollThread == null) + { + // finished and nulled itself + t.stop(); + } + } + }); + t.start(); } } @@ -293,8 +359,8 @@ public class IdPanel extends JPanel implements MouseListener, } if ((av.getSelectionGroup() == null) - || (!jalview.util.Platform.isControlDown(e) && !e.isShiftDown() && av - .getSelectionGroup() != null)) + || (!jalview.util.Platform.isControlDown(e) && !e.isShiftDown() + && av.getSelectionGroup() != null)) { av.setSelectionGroup(new SequenceGroup()); av.getSelectionGroup().setStartRes(0); @@ -313,7 +379,7 @@ public class IdPanel extends JPanel implements MouseListener, av.isSelectionGroupChanged(true); - alignPanel.paintAlignment(true); + alignPanel.paintAlignment(false, false); } /** @@ -331,7 +397,8 @@ public class IdPanel extends JPanel implements MouseListener, * and any non-positional features */ List nlinks = Preferences.sequenceUrlLinks.getLinksForMenu(); - for (SequenceFeature sf : sq.getFeatures().getNonPositionalFeatures()) + List features = sq.getFeatures().getNonPositionalFeatures(); + for (SequenceFeature sf : features) { if (sf.links != null) { @@ -342,7 +409,7 @@ public class IdPanel extends JPanel implements MouseListener, } } - PopupMenu pop = new PopupMenu(alignPanel, sq, nlinks, + PopupMenu pop = new PopupMenu(alignPanel, sq, features, Preferences.getGroupURLLinks()); pop.show(this, e.getX(), e.getY()); } @@ -391,8 +458,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), + i == end); } } @@ -405,10 +472,7 @@ public class IdPanel extends JPanel implements MouseListener, @Override public void mouseReleased(MouseEvent e) { - if (scrollThread != null) - { - scrollThread.running = false; - } + stopScrolling(); mouseDragging = false; PaintRefresher.Refresh(this, av.getSequenceSetId()); @@ -442,7 +506,7 @@ public class IdPanel extends JPanel implements MouseListener, if ((av.getRanges().getStartSeq() > index) || (av.getRanges().getEndSeq() < index)) { - alignPanel.setScrollValues(av.getRanges().getStartRes(), index); + av.getRanges().setStartSeq(index); } } @@ -456,24 +520,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 by a call to stopScrolling. + */ @Override public void run() { @@ -481,34 +563,7 @@ public class IdPanel extends JPanel implements MouseListener, while (running) { - if (alignPanel.scrollUp(up)) - { - // scroll was ok, so add new sequence to selection - int seq = av.getRanges().getStartSeq(); - - if (!up) - { - seq = av.getRanges().getEndSeq(); - } - - if (seq < lastid) - { - selectSeqs(lastid - 1, seq); - } - else if (seq > lastid) - { - selectSeqs(lastid + 1, seq); - } - - lastid = seq; - } - else - { - running = false; - } - - alignPanel.paintAlignment(false); - + running = scrollOnce(); try { Thread.sleep(100); @@ -516,6 +571,27 @@ public class IdPanel extends JPanel implements MouseListener, { } } + IdPanel.this.scrollThread = null; + } + + /** + * Scrolls one row up or down. Answers true if a scroll could be done, false + * if not (top or bottom of alignment reached). + */ + boolean scrollOnce() + { + ViewportRanges ranges = IdPanel.this.av.getRanges(); + if (ranges.scrollUp(up)) + { + int toSeq = up ? ranges.getStartSeq() : ranges.getEndSeq(); + int fromSeq = toSeq < lastid ? lastid - 1 : lastid + 1; + IdPanel.this.selectSeqs(fromSeq, toSeq); + lastid = toSeq; + alignPanel.paintAlignment(false, false); + return true; + } + + return false; } } }