JAL-1160 support horizontal mouse wheel scrolling events

[jalview.git] / src / jalview / gui / IdPanel.java

diff --git a/src/jalview/gui/IdPanel.java b/src/jalview/gui/IdPanel.java
index fa97215..a42251e 100755 (executable)
--- a/src/jalview/gui/IdPanel.java
+++ b/src/jalview/gui/IdPanel.java
@@ -1,18 +1,18 @@
 /*
  * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7)
  * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, G Barton, M Clamp, S Searle
- * 
+ *
  * This file is part of Jalview.
- * 
+ *
  * Jalview is free software: you can redistribute it and/or
- * modify it under the terms of the GNU General Public License 
+ * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- * 
- * Jalview is distributed in the hope that it will be useful, but 
- * WITHOUT ANY WARRANTY; without even the implied warranty 
- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+ *
+ * Jalview is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR
  * PURPOSE.  See the GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
  */
 package jalview.gui;
@@ -25,11 +25,12 @@ import java.util.Vector;
 import javax.swing.*;
 
 import jalview.datamodel.*;
+import jalview.io.SequenceAnnotationReport;
 import jalview.util.UrlLink;
 
 /**
  * DOCUMENT ME!
- * 
+ *
  * @author $author$
  * @version $Revision$
  */
@@ -52,10 +53,11 @@ public class IdPanel extends JPanel implements MouseListener,
   int lastid = -1;
 
   boolean mouseDragging = false;
+  private final SequenceAnnotationReport seqAnnotReport;
 
   /**
    * Creates a new IdPanel object.
-   * 
+   *
    * @param av
    *          DOCUMENT ME!
    * @param parent
@@ -67,6 +69,7 @@ public class IdPanel extends JPanel implements MouseListener,
     alignPanel = parent;
     idCanvas = new IdCanvas(av);
     linkImageURL = getClass().getResource("/images/link.gif").toString();
+    seqAnnotReport = new SequenceAnnotationReport(linkImageURL);
     setLayout(new BorderLayout());
     add(idCanvas, BorderLayout.CENTER);
     addMouseListener(this);
@@ -74,83 +77,36 @@ public class IdPanel extends JPanel implements MouseListener,
     addMouseWheelListener(this);
     ToolTipManager.sharedInstance().registerComponent(this);
   }
-
   /**
    * DOCUMENT ME!
-   * 
+   *
    * @param e
    *          DOCUMENT ME!
    */
+  @Override
   public void mouseMoved(MouseEvent e)
   {
     SeqPanel sp = alignPanel.seqPanel;
     int seq = Math.max(0, sp.findSeq(e));
-    String tmp;
     if (seq > -1 && seq < av.getAlignment().getHeight())
     {
       SequenceI sequence = av.getAlignment().getSequenceAt(seq);
       StringBuffer tip = new StringBuffer();
-      tip.append("<i>");
-
-      int maxWidth = 0;
-      if (sequence.getDescription() != null)
-      {
-        tmp = sequence.getDescription();
-        tip.append("<br>" + tmp);
-        maxWidth = Math.max(maxWidth, tmp.length());
-      }
-
-      DBRefEntry[] dbrefs = sequence.getDatasetSequence().getDBRef();
-      if (av.isShowDbRefs() && dbrefs != null)
-      {
-        for (int i = 0; i < dbrefs.length; i++)
-        {
-          tip.append("<br>");
-          tmp = dbrefs[i].getSource() + " " + dbrefs[i].getAccessionId();
-          tip.append(tmp);
-          maxWidth = Math.max(maxWidth, tmp.length());
-        }
-      }
-
-      // ADD NON POSITIONAL SEQUENCE INFO
-      SequenceFeature[] features = sequence.getDatasetSequence()
-              .getSequenceFeatures();
-      SequenceFeature[] tfeat = new SequenceFeature[1];
-      if (av.isShowNpFeats() && features != null)
-      {
-        for (int i = 0; i < features.length; i++)
-        {
-          if (features[i].begin == 0 && features[i].end == 0)
-          {
-            int sz = -tip.length();
-            tfeat[0] = features[i];
-            sp.appendFeatures(tip, linkImageURL, 0, tfeat,
-                    sp.seqCanvas.fr.minmax);
-            sz += tip.length();
-            maxWidth = Math.max(maxWidth, sz);
-          }
-        }
-      }
-
-      if (maxWidth > 60)
-      {
-        tip.insert(0, "<table width=350 border=0><tr><td><i>");
-        tip.append("</i></td></tr></table>");
-      }
-
-      tip.append("</html>");
-
+      seqAnnotReport.createSequenceAnnotationReport(tip, sequence,
+              av.isShowDbRefs(), av.isShowNpFeats(),
+              sp.seqCanvas.fr.minmax);
       setToolTipText("<html>" + sequence.getDisplayId(true) + " "
-              + tip.toString());
+              + tip.toString()+"</html>");
     }
   }
 
   /**
    * DOCUMENT ME!
-   * 
+   *
    * @param e
    *          DOCUMENT ME!
    */
+  @Override
   public void mouseDragged(MouseEvent e)
   {
     mouseDragging = true;
@@ -170,25 +126,38 @@ public class IdPanel extends JPanel implements MouseListener,
     alignPanel.paintAlignment(true);
   }
 
+  @Override
   public void mouseWheelMoved(MouseWheelEvent e)
   {
     e.consume();
     if (e.getWheelRotation() > 0)
     {
-      alignPanel.scrollUp(false);
+      if (e.isShiftDown())
+      {
+        alignPanel.scrollRight(true);
+        
+      } else {
+        alignPanel.scrollUp(false);
+      }
     }
     else
     {
-      alignPanel.scrollUp(true);
+      if (e.isShiftDown())
+      {
+        alignPanel.scrollRight(false);
+      } else {
+        alignPanel.scrollUp(true);
+      }
     }
   }
 
   /**
    * DOCUMENT ME!
-   * 
+   *
    * @param e
    *          DOCUMENT ME!
    */
+  @Override
   public void mouseClicked(MouseEvent e)
   {
     if (e.getClickCount() < 2)
@@ -257,10 +226,11 @@ public class IdPanel extends JPanel implements MouseListener,
 
   /**
    * DOCUMENT ME!
-   * 
+   *
    * @param e
    *          DOCUMENT ME!
    */
+  @Override
   public void mouseEntered(MouseEvent e)
   {
     if (scrollThread != null)
@@ -271,10 +241,11 @@ public class IdPanel extends JPanel implements MouseListener,
 
   /**
    * DOCUMENT ME!
-   * 
+   *
    * @param e
    *          DOCUMENT ME!
    */
+  @Override
   public void mouseExited(MouseEvent e)
   {
     if (av.getWrapAlignment())
@@ -296,10 +267,11 @@ public class IdPanel extends JPanel implements MouseListener,
 
   /**
    * DOCUMENT ME!
-   * 
+   *
    * @param e
    *          DOCUMENT ME!
    */
+  @Override
   public void mousePressed(MouseEvent e)
   {
     if (e.getClickCount() == 2)
@@ -359,7 +331,7 @@ public class IdPanel extends JPanel implements MouseListener,
 
   /**
    * DOCUMENT ME!
-   * 
+   *
    * @param seq
    *          DOCUMENT ME!
    */
@@ -373,7 +345,7 @@ public class IdPanel extends JPanel implements MouseListener,
 
   /**
    * DOCUMENT ME!
-   * 
+   *
    * @param start
    *          DOCUMENT ME!
    * @param end
@@ -410,10 +382,11 @@ public class IdPanel extends JPanel implements MouseListener,
 
   /**
    * DOCUMENT ME!
-   * 
+   *
    * @param e
    *          DOCUMENT ME!
    */
+  @Override
   public void mouseReleased(MouseEvent e)
   {
     if (scrollThread != null)
@@ -429,7 +402,7 @@ public class IdPanel extends JPanel implements MouseListener,
 
   /**
    * DOCUMENT ME!
-   * 
+   *
    * @param list
    *          DOCUMENT ME!
    */
@@ -442,7 +415,7 @@ public class IdPanel extends JPanel implements MouseListener,
       return;
     }
 
-    int index = av.getAlignment().findIndex((SequenceI) list.get(0));
+    int index = av.getAlignment().findIndex(list.get(0));
 
     // do we need to scroll the panel?
     if ((av.getStartSeq() > index) || (av.getEndSeq() < index))
@@ -469,6 +442,7 @@ public class IdPanel extends JPanel implements MouseListener,
       running = false;
     }
 
+    @Override
     public void run()
     {
       running = true;