X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FIdPanel.java;h=f66f445094e5c9726eb43c079b896a5a823b4f2d;hb=174230b4233d9ce80f94527768d2cd2f76da11ab;hp=b6e6a2b1fa0a448285711002d0370765e31ee469;hpb=9344c308a62c48e2ddedd12247edab74e581c2e7;p=jalview.git

diff --git a/src/jalview/appletgui/IdPanel.java b/src/jalview/appletgui/IdPanel.java
index b6e6a2b..f66f445 100755
--- a/src/jalview/appletgui/IdPanel.java
+++ b/src/jalview/appletgui/IdPanel.java
@@ -1,6 +1,6 @@
 /*
  * Jalview - A Sequence Alignment Editor and Viewer
- * Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
+ * Copyright (C) 2006 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
@@ -50,12 +50,12 @@ public class IdPanel
     idCanvas.addMouseMotionListener(this);
 
     String label, url;
-    if(parent.alignFrame.applet!=null)
+    if(av.applet!=null)
     {
       for (int i = 1; i < 10; i++)
       {
-        label = parent.alignFrame.applet.getParameter("linkLabel_" + i);
-        url = parent.alignFrame.applet.getParameter("linkURL_" + i);
+        label = av.applet.getParameter("linkLabel_" + i);
+        url = av.applet.getParameter("linkURL_" + i);
 
         if (label != null && url != null)
           links.addElement(label + "|" + url);
@@ -65,29 +65,43 @@ public class IdPanel
     if (links.size() < 1)
     {
       links = new java.util.Vector();
-      links.addElement("SRS|http://srs.ebi.ac.uk/srs7bin/cgi-bin/wgetz?-e+[uniprot-all:$SEQUENCE_ID$]+-vn+2");
+      links.addElement("SRS|http://srs.ebi.ac.uk/srsbin/cgi-bin/wgetz?-newId+(([uniprot-all:$SEQUENCE_ID$]))+-view+SwissEntry");
     }
   }
 
+  Tooltip tooltip;
   public void mouseMoved(MouseEvent e)
-  {}
-
-  public void mouseDragged(MouseEvent e)
   {
-    mouseDragging = true;
+    int seq = alignPanel.seqPanel.findSeq(e);
 
-    int y = e.getY();
-    if (av.getWrapAlignment())
-    {
-      y -= 2 * av.charHeight;
-    }
-    int seq = av.getIndex(y);
+    SequenceI sequence = av.getAlignment().getSequenceAt(seq);
 
-    if (seq < 0)
+    if(sequence.getDescription()==null)
     {
+      if(tooltip!=null)
+        tooltip.setVisible(false);
+      tooltip = null;
       return;
     }
 
+    if (tooltip == null)
+      tooltip = new Tooltip(
+          sequence.getDisplayId(true)
+          + "\n" + sequence.getDescription(), idCanvas);
+    else
+      tooltip.setTip(sequence.getDisplayId(true)
+                     + "\n" + sequence.getDescription());
+
+    tooltip.repaint();
+
+  }
+
+  public void mouseDragged(MouseEvent e)
+  {
+    mouseDragging = true;
+
+    int seq = Math.max(0, alignPanel.seqPanel.findSeq(e));
+
     if (seq < lastid)
     {
       selectSeqs(lastid - 1, seq);
@@ -106,16 +120,12 @@ public class IdPanel
     if (e.getClickCount() < 2)
         return;
 
-    int y = e.getY();
-
-    if (av.getWrapAlignment())
-    {
-      y -= (2 * av.charHeight);
-    }
 
     //DEFAULT LINK IS FIRST IN THE LINK LIST
-    int seq = av.getIndex(y);
+    int seq = alignPanel.seqPanel.findSeq(e);
     String id = av.getAlignment().getSequenceAt(seq).getName();
+    if (id.indexOf("|") > -1)
+        id = id.substring(id.lastIndexOf("|") + 1);
 
     String target = links.elementAt(0).toString();
     target = target.substring(0, target.indexOf("|"));
@@ -127,7 +137,8 @@ public class IdPanel
 
     try
     {
-      jalview.bin.JalviewLite.showURL(url, target);
+
+      alignPanel.alignFrame.showURL(url, target);
     }
     catch (Exception ex)
     {
@@ -175,11 +186,7 @@ public class IdPanel
       y -= 2 * av.charHeight;
     }
 
-    int seq = av.getIndex(y);
-    if (seq == -1)
-    {
-      return;
-    }
+    int seq = alignPanel.seqPanel.findSeq(e);
 
     if ( (e.getModifiers() & InputEvent.BUTTON3_MASK) ==
         InputEvent.BUTTON3_MASK)
@@ -190,31 +197,15 @@ public class IdPanel
       return;
     }
 
-    if (!e.isControlDown() && !e.isShiftDown() &&
-        av.alignment.findGroup(av.alignment.getSequenceAt(seq)) != null)
-    {
-
-      SequenceGroup selection = new SequenceGroup();
-      SequenceGroup sg = av.alignment.findGroup(av.alignment.getSequenceAt(seq));
-      selection.setStartRes(0);
-      selection.setEndRes(av.alignment.getWidth() - 1);
-      for (int i = 0; i < sg.getSize(); i++)
-      {
-        selection.addSequence(sg.getSequenceAt(i), true);
-      }
 
-      av.setSelectionGroup(selection);
-      return;
-    }
-
-    if (av.getSelectionGroup() == null ||
-        (!e.isControlDown() && av.getSelectionGroup() != null))
+    if ((av.getSelectionGroup() == null) ||
+            ((!e.isControlDown() && !e.isShiftDown()) && av.getSelectionGroup() != null))
     {
       av.setSelectionGroup(new SequenceGroup());
+      av.getSelectionGroup().setStartRes(0);
+      av.getSelectionGroup().setEndRes(av.alignment.getWidth() - 1);
     }
 
-    av.getSelectionGroup().setStartRes(0);
-    av.getSelectionGroup().setEndRes(av.alignment.getWidth() - 1);
 
     if (e.isShiftDown() && lastid != -1)
     {
@@ -321,11 +312,12 @@ public class IdPanel
           {
             selectSeqs(lastid - 1, seq);
           }
-          else if (seq > lastid)
+          else if (seq > lastid && seq<av.alignment.getHeight())
           {
             selectSeqs(lastid + 1, seq);
           }
 
+
           lastid = seq;
         }
         else