X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fgui%2FIdPanel.java;h=5f1bb56f531119ddec1f4a4652a8191b6844e491;hb=a928b501e71cef2627004a73e2d5c460b44b2d7b;hp=4741974d1ebf2a626c9b16daa55c7f61dc041f06;hpb=5d01e85b903f9ce67b2b4a32e9e7a02f57d9f2e9;p=jalview.git

diff --git a/src/jalview/gui/IdPanel.java b/src/jalview/gui/IdPanel.java
index 4741974..5f1bb56 100755
--- a/src/jalview/gui/IdPanel.java
+++ b/src/jalview/gui/IdPanel.java
@@ -1,17 +1,17 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer
- * Copyright (C) 2007 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
- *
+ * Jalview - A Sequence Alignment Editor and Viewer (Development Version 2.4.1)
+ * Copyright (C) 2009 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
+ * 
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- *
+ * 
  * This program 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 this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
@@ -20,6 +20,8 @@ package jalview.gui;
 
 import java.awt.*;
 import java.awt.event.*;
+import java.util.Vector;
+
 import javax.swing.*;
 
 import jalview.datamodel.*;
@@ -27,34 +29,43 @@ import jalview.util.UrlLink;
 
 /**
  * DOCUMENT ME!
- *
+ * 
  * @author $author$
  * @version $Revision$
  */
-public class IdPanel
-    extends JPanel implements MouseListener,
-    MouseMotionListener, MouseWheelListener
+public class IdPanel extends JPanel implements MouseListener,
+        MouseMotionListener, MouseWheelListener
 {
   protected IdCanvas idCanvas;
+
   protected AlignViewport av;
+
   protected AlignmentPanel alignPanel;
+
   ScrollThread scrollThread = null;
+  String linkImageURL;
+  
   int offy;
+
   // int width;
   int lastid = -1;
+
   boolean mouseDragging = false;
 
   /**
    * Creates a new IdPanel object.
-   *
-   * @param av DOCUMENT ME!
-   * @param parent DOCUMENT ME!
+   * 
+   * @param av
+   *                DOCUMENT ME!
+   * @param parent
+   *                DOCUMENT ME!
    */
   public IdPanel(AlignViewport av, AlignmentPanel parent)
   {
     this.av = av;
     alignPanel = parent;
     idCanvas = new IdCanvas(av);
+    linkImageURL = getClass().getResource("/images/link.gif").toString();
     setLayout(new BorderLayout());
     add(idCanvas, BorderLayout.CENTER);
     addMouseListener(this);
@@ -65,12 +76,14 @@ public class IdPanel
 
   /**
    * DOCUMENT ME!
-   *
-   * @param e DOCUMENT ME!
+   * 
+   * @param e
+   *                DOCUMENT ME!
    */
   public void mouseMoved(MouseEvent e)
   {
-    int seq = Math.max(0, alignPanel.seqPanel.findSeq(e));
+    SeqPanel sp = alignPanel.seqPanel;
+    int seq = Math.max(0, sp.findSeq(e));
     String tmp;
     if (seq > -1 && seq < av.alignment.getHeight())
     {
@@ -82,12 +95,12 @@ public class IdPanel
       if (sequence.getDescription() != null)
       {
         tmp = sequence.getDescription();
-        tip.append("<br>"+tmp);
+        tip.append("<br>" + tmp);
         maxWidth = Math.max(maxWidth, tmp.length());
       }
 
       DBRefEntry[] dbrefs = sequence.getDatasetSequence().getDBRef();
-      if (dbrefs != null)
+      if (av.isShowDbRefs() && dbrefs != null)
       {
         for (int i = 0; i < dbrefs.length; i++)
         {
@@ -98,41 +111,43 @@ public class IdPanel
         }
       }
 
-
-      //ADD NON POSITIONAL SEQUENCE INFO
-      SequenceFeature[] features = sequence.getDatasetSequence().
-          getSequenceFeatures();
-      if (features != null)
+      // 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)
           {
-            tmp = features[i].featureGroup
-                       + " " + features[i].getType() + " " +
-                       features[i].description;
-            tip.append("<br>" + tmp);
-            maxWidth = Math.max(maxWidth, tmp.length());
+            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)
+      if (maxWidth > 60)
       {
-         tip.insert(0, "<table width=350 border=0><tr><td><i>");
-         tip.append("</i></td></tr></table>");
+        tip.insert(0, "<table width=350 border=0><tr><td><i>");
+        tip.append("</i></td></tr></table>");
       }
 
       tip.append("</html>");
 
-      setToolTipText("<html>"+sequence.getDisplayId(true)+tip.toString());
+      setToolTipText("<html>" + sequence.getDisplayId(true)
+              + " "+tip.toString());
     }
   }
 
   /**
    * DOCUMENT ME!
-   *
-   * @param e DOCUMENT ME!
+   * 
+   * @param e
+   *                DOCUMENT ME!
    */
   public void mouseDragged(MouseEvent e)
   {
@@ -148,7 +163,7 @@ public class IdPanel
     {
       selectSeqs(lastid + 1, seq);
     }
-
+    
     lastid = seq;
     alignPanel.paintAlignment(true);
   }
@@ -156,20 +171,21 @@ public class IdPanel
   public void mouseWheelMoved(MouseWheelEvent e)
   {
     e.consume();
-      if (e.getWheelRotation() > 0)
-      {
-        alignPanel.scrollUp(false);
-      }
-      else
-      {
-        alignPanel.scrollUp(true);
-      }
+    if (e.getWheelRotation() > 0)
+    {
+      alignPanel.scrollUp(false);
+    }
+    else
+    {
+      alignPanel.scrollUp(true);
+    }
   }
 
   /**
    * DOCUMENT ME!
-   *
-   * @param e DOCUMENT ME!
+   * 
+   * @param e
+   *                DOCUMENT ME!
    */
   public void mouseClicked(MouseEvent e)
   {
@@ -213,7 +229,7 @@ public class IdPanel
       }
 
       String urls[] = urlLink.makeUrls(id, true);
-      if (urls == null || urls[0]==null || urls[0].length()<4)
+      if (urls == null || urls[0] == null || urls[0].length() < 4)
       {
         url = null;
         continue;
@@ -224,24 +240,24 @@ public class IdPanel
     try
     {
       jalview.util.BrowserLauncher.openURL(url);
-    }
-    catch (Exception ex)
+    } catch (Exception ex)
     {
-      JOptionPane.showInternalMessageDialog(Desktop.desktop,
-                                            "Unixers: Couldn't find default web browser."
-                                            +
-          "\nAdd the full path to your browser in Preferences.",
-                                            "Web browser not found",
-                                            JOptionPane.WARNING_MESSAGE);
+      JOptionPane
+              .showInternalMessageDialog(
+                      Desktop.desktop,
+                      "Unixers: Couldn't find default web browser."
+                              + "\nAdd the full path to your browser in Preferences.",
+                      "Web browser not found", JOptionPane.WARNING_MESSAGE);
       ex.printStackTrace();
     }
-    
+
   }
 
   /**
    * DOCUMENT ME!
-   *
-   * @param e DOCUMENT ME!
+   * 
+   * @param e
+   *                DOCUMENT ME!
    */
   public void mouseEntered(MouseEvent e)
   {
@@ -253,8 +269,9 @@ public class IdPanel
 
   /**
    * DOCUMENT ME!
-   *
-   * @param e DOCUMENT ME!
+   * 
+   * @param e
+   *                DOCUMENT ME!
    */
   public void mouseExited(MouseEvent e)
   {
@@ -268,8 +285,8 @@ public class IdPanel
       scrollThread = new ScrollThread(true);
     }
 
-    if (mouseDragging && (e.getY() >= getHeight()) &&
-        (av.alignment.getHeight() > av.getEndSeq()))
+    if (mouseDragging && (e.getY() >= getHeight())
+            && (av.alignment.getHeight() > av.getEndSeq()))
     {
       scrollThread = new ScrollThread(false);
     }
@@ -277,8 +294,9 @@ public class IdPanel
 
   /**
    * DOCUMENT ME!
-   *
-   * @param e DOCUMENT ME!
+   * 
+   * @param e
+   *                DOCUMENT ME!
    */
   public void mousePressed(MouseEvent e)
   {
@@ -291,16 +309,36 @@ public class IdPanel
 
     if (javax.swing.SwingUtilities.isRightMouseButton(e))
     {
+      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.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,
-          (Sequence) av.getAlignment().getSequenceAt(seq),
-          Preferences.sequenceURLLinks);
+              sq,
+              nlinks, new Vector(Preferences.getGroupURLLinks()));
       pop.show(this, e.getX(), e.getY());
 
       return;
     }
 
-    if ( (av.getSelectionGroup() == null) ||
-        ( (!e.isControlDown() && !e.isShiftDown()) && av.getSelectionGroup() != null))
+    if ((av.getSelectionGroup() == null)
+            || ((!e.isControlDown() && !e.isShiftDown()) && av
+                    .getSelectionGroup() != null))
     {
       av.setSelectionGroup(new SequenceGroup());
       av.getSelectionGroup().setStartRes(0);
@@ -315,14 +353,14 @@ public class IdPanel
     {
       selectSeq(seq);
     }
-
     alignPanel.paintAlignment(true);
   }
 
   /**
    * DOCUMENT ME!
-   *
-   * @param seq DOCUMENT ME!
+   * 
+   * @param seq
+   *                DOCUMENT ME!
    */
   void selectSeq(int seq)
   {
@@ -334,9 +372,11 @@ public class IdPanel
 
   /**
    * DOCUMENT ME!
-   *
-   * @param start DOCUMENT ME!
-   * @param end DOCUMENT ME!
+   * 
+   * @param start
+   *                DOCUMENT ME!
+   * @param end
+   *                DOCUMENT ME!
    */
   void selectSeqs(int start, int end)
   {
@@ -362,15 +402,15 @@ public class IdPanel
 
     for (int i = start; i <= end; i++)
     {
-      av.getSelectionGroup().addSequence(av.getAlignment().getSequenceAt(i),
-                                         true);
+      av.getSelectionGroup().addSequence(
+              av.getAlignment().getSequenceAt(i), true);
     }
   }
-
   /**
    * DOCUMENT ME!
-   *
-   * @param e DOCUMENT ME!
+   * 
+   * @param e
+   *                DOCUMENT ME!
    */
   public void mouseReleased(MouseEvent e)
   {
@@ -378,6 +418,12 @@ public class IdPanel
     {
       scrollThread.running = false;
     }
+//    if (mouseDragging)
+    {
+      // always send selection message when mouse is released
+      av.sendSelection();
+      
+    }
 
     mouseDragging = false;
     PaintRefresher.Refresh(this, av.getSequenceSetId());
@@ -385,8 +431,9 @@ public class IdPanel
 
   /**
    * DOCUMENT ME!
-   *
-   * @param found DOCUMENT ME!
+   * 
+   * @param found
+   *                DOCUMENT ME!
    */
   public void highlightSearchResults(java.util.Vector found)
   {
@@ -397,20 +444,20 @@ public class IdPanel
       return;
     }
 
-    int index = av.alignment.findIndex( (SequenceI) found.get(0));
+    int index = av.alignment.findIndex((SequenceI) found.get(0));
 
     // do we need to scroll the panel?
-    if ( (av.getStartSeq() > index) || (av.getEndSeq() < index))
+    if ((av.getStartSeq() > index) || (av.getEndSeq() < index))
     {
       alignPanel.setScrollValues(av.getStartRes(), index);
     }
   }
 
   // this class allows scrolling off the bottom of the visible alignment
-  class ScrollThread
-      extends Thread
+  class ScrollThread extends Thread
   {
     boolean running = false;
+
     boolean up = true;
 
     public ScrollThread(boolean up)
@@ -461,8 +508,7 @@ public class IdPanel
         try
         {
           Thread.sleep(100);
-        }
-        catch (Exception ex)
+        } catch (Exception ex)
         {
         }
       }