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
if (evt.isAltDown() || evt.isControlDown())\r
{\r
groupEditing = true;\r
+\r
}\r
\r
editingSeqs = true;\r
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
// 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
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
\r
try\r
{\r
- Thread.sleep(75);\r
+ Thread.sleep(20);\r
}\r
catch (Exception ex)\r
{\r