git://source.jalview.org / jalview.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
No more dbprefix
[jalview.git] / src / jalview / gui / SeqPanel.java
diff --git a/src/jalview/gui/SeqPanel.java b/src/jalview/gui/SeqPanel.java
index 53130af..3209960 100755 (executable)
--- a/src/jalview/gui/SeqPanel.java
+++ b/src/jalview/gui/SeqPanel.java
@@ -95,6 +95,13 @@ public class SeqPanel extends JPanel
                 public void mouseMoved(MouseEvent evt)\r
                 {\r
                     doMouseMoved(evt);\r
+                    if (editingSeqs)\r
+                    {\r
+                      // This is because MacOSX creates a mouseMoved\r
+                      // If control is down\r
+                      if(!av.isDataset())\r
+                        doMouseDragged(evt);\r
+                    }\r
                 }\r
 \r
                 public void mouseDragged(MouseEvent evt)\r
@@ -173,6 +180,7 @@ public class SeqPanel extends JPanel
                if (evt.isAltDown() || evt.isControlDown())\r
                {\r
                  groupEditing = true;\r
+\r
                }\r
 \r
                editingSeqs = true;\r
@@ -349,6 +357,12 @@ public class SeqPanel extends JPanel
         return;\r
       }\r
 \r
+      if(seqCanvas.pdbCanvas!=null && sequence==seqCanvas.pdbCanvas.sequence)\r
+      {\r
+        seqCanvas.pdbCanvas.highlightRes(sequence.findPosition(res));\r
+      }\r
+\r
+\r
         StringBuffer text = new StringBuffer("Sequence " + (seq + 1) + " ID: " +\r
                 sequence.getName());\r
 \r
@@ -382,7 +396,7 @@ public class SeqPanel extends JPanel
         // use aa to see if the mouse pointer is on a\r
         if (av.showSequenceFeatures)\r
         {\r
-            Vector features = sequence.getSequenceFeatures();\r
+            Vector features = sequence.getDatasetSequence().getSequenceFeatures();\r
             if(features!=null)\r
             {\r
               StringBuffer sbuffer = new StringBuffer("<html>");\r
@@ -394,27 +408,42 @@ public class SeqPanel extends JPanel
                 if ( (sf.getBegin() <= sequence.findPosition(res)) &&\r
                     (sf.getEnd() >= sequence.findPosition(res)))\r
                 {\r
-                  if (sbuffer.length() > 6)\r
-                    sbuffer.append("<br>");\r
-\r
-                  sbuffer.append(sf.getType());\r
-                  if (sf.getDescription() != null)\r
-                    sbuffer.append(" " + sf.getDescription());\r
-\r
-                  if (sf.getStatus() != null)\r
+                  if (sf.getType().equals("disulfide bond"))\r
+                  {\r
+                    if (sf.getBegin() == sequence.findPosition(res)\r
+                        || sf.getEnd() == sequence.findPosition(res))\r
+                    {\r
+                      if (sbuffer.length() > 6)\r
+                        sbuffer.append("<br>");\r
+                      sbuffer.append("disulfide bond " + sf.getBegin() + ":" +\r
+                                     sf.getEnd());\r
+                    }\r
+                  }\r
+                  else\r
                   {\r
-                    sbuffer.append(" (" + sf.getStatus() + ")");\r
+                    if (sbuffer.length() > 6)\r
+                      sbuffer.append("<br>");\r
+                    sbuffer.append(sf.getType());\r
+                    if (sf.getDescription() != null)\r
+                      sbuffer.append(" " + sf.getDescription());\r
+\r
+                    if (sf.getStatus() != null)\r
+                    {\r
+                      sbuffer.append(" (" + sf.getStatus() + ")");\r
+                    }\r
                   }\r
                 }\r
 \r
               }\r
 \r
               sbuffer.append("</html>");\r
-              if(sbuffer.equals("<html></html>"))\r
+              if(sbuffer.length()==13) // <html></html>\r
                 setToolTipText("");\r
               else\r
                setToolTipText(sbuffer.toString());\r
             }\r
+            else\r
+              setToolTipText("");\r
         }\r
     }\r
 \r
@@ -980,7 +1009,7 @@ public class SeqPanel extends JPanel
 \r
                 try\r
                 {\r
-                    Thread.sleep(75);\r
+                    Thread.sleep(20);\r
                 }\r
                 catch (Exception ex)\r
                 {\r