*/\r
package jalview.gui;\r
\r
-import jalview.analysis.*;\r
-\r
import jalview.datamodel.*;\r
\r
import jalview.schemes.*;\r
\r
ap = p;\r
\r
+\r
addMouseMotionListener(new MouseMotionAdapter()\r
{\r
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
{\r
if (editingSeqs)\r
{\r
+ if(!av.isDataset())\r
doMouseDragged(evt);\r
}\r
else\r
{\r
+ if(!av.isDataset())\r
doMouseDraggedDefineMode(evt);\r
}\r
}\r
{\r
Font font = av.getFont();\r
int fontSize = font.getSize();\r
- if (e.getWheelRotation() > 0 && fontSize < 30)\r
+ if (e.getWheelRotation() > 0 && fontSize < 51)\r
fontSize++;\r
else if (fontSize > 1)\r
fontSize--;\r
});\r
\r
\r
- addMouseListener(new MouseAdapter()\r
- {\r
- public void mouseReleased(MouseEvent evt)\r
- {\r
- mouseWheelPressed = false;\r
-\r
- if (editingSeqs)\r
- {\r
- doMouseReleased(evt);\r
- }\r
- else\r
- {\r
- doMouseReleasedDefineMode(evt);\r
- }\r
- }\r
-\r
- public void mousePressed(MouseEvent evt)\r
- {\r
- if( javax.swing.SwingUtilities.isMiddleMouseButton(evt))\r
- {\r
- mouseWheelPressed = true;\r
- return;\r
- }\r
+ if(!av.isDataset())\r
+ {\r
+ addMouseListener(new MouseAdapter()\r
+ {\r
+ public void mouseReleased(MouseEvent evt)\r
+ {\r
+ mouseWheelPressed = false;\r
\r
- if (evt.isShiftDown() || evt.isAltDown() ||\r
- evt.isControlDown())\r
- {\r
- if (evt.isAltDown() || evt.isControlDown())\r
- {\r
- groupEditing = true;\r
- }\r
+ if (editingSeqs)\r
+ {\r
+ doMouseReleased(evt);\r
+ }\r
+ else\r
+ {\r
+ doMouseReleasedDefineMode(evt);\r
+ }\r
+ }\r
\r
- editingSeqs = true;\r
- doMousePressed(evt);\r
- }\r
- else\r
- {\r
- doMousePressedDefineMode(evt);\r
- }\r
- }\r
+ public void mousePressed(MouseEvent evt)\r
+ {\r
+ if (javax.swing.SwingUtilities.isMiddleMouseButton(evt))\r
+ {\r
+ mouseWheelPressed = true;\r
+ return;\r
+ }\r
+\r
+ if (evt.isShiftDown() || evt.isAltDown() ||\r
+ evt.isControlDown())\r
+ {\r
+ if (evt.isAltDown() || evt.isControlDown())\r
+ {\r
+ groupEditing = true;\r
+\r
+ }\r
+\r
+ editingSeqs = true;\r
+ doMousePressed(evt);\r
+ }\r
+ else\r
+ {\r
+ doMousePressedDefineMode(evt);\r
+ }\r
+ }\r
\r
- public void mouseExited(MouseEvent evt)\r
- {\r
- if (editingSeqs)\r
- {\r
- return;\r
- }\r
+ public void mouseExited(MouseEvent evt)\r
+ {\r
+ if (editingSeqs)\r
+ {\r
+ return;\r
+ }\r
\r
- doMouseExitedDefineMode(evt);\r
- }\r
+ doMouseExitedDefineMode(evt);\r
+ }\r
\r
- public void mouseEntered(MouseEvent evt)\r
- {\r
- if (editingSeqs)\r
- {\r
- return;\r
- }\r
+ public void mouseEntered(MouseEvent evt)\r
+ {\r
+ if (editingSeqs)\r
+ {\r
+ return;\r
+ }\r
\r
- doMouseEnteredDefineMode(evt);\r
- }\r
- });\r
+ doMouseEnteredDefineMode(evt);\r
+ }\r
+ });\r
+ }\r
}\r
\r
+ int startWrapBlock=-1;\r
+ int wrappedBlock=-1;\r
int findRes(MouseEvent evt)\r
{\r
int res = 0;\r
\r
if (av.wrapAlignment)\r
{\r
+\r
+ int hgap = av.charHeight;\r
+ if (av.scaleAboveWrapped)\r
+ hgap += av.charHeight;\r
+\r
+ int cHeight = av.getAlignment().getHeight() * av.charHeight\r
+ + hgap + seqCanvas.getAnnotationHeight();\r
+\r
int y = evt.getY();\r
- y -= (2 * av.charHeight);\r
+ y -= hgap;\r
x -= seqCanvas.LABEL_WEST;\r
\r
- int chunkHeight = (av.getAlignment().getHeight() + 2) * av.charHeight;\r
+\r
int cwidth = seqCanvas.getWrappedCanvasWidth(this.getWidth());\r
- int block = y/chunkHeight;\r
- block += av.getStartRes()/cwidth;\r
\r
- res = block*cwidth + x / av.getCharWidth();\r
+ wrappedBlock = y / cHeight;\r
+ wrappedBlock += av.getStartRes() / cwidth;\r
+\r
+ res = wrappedBlock * cwidth + x / av.getCharWidth();\r
+\r
}\r
else\r
{\r
\r
int findSeq(MouseEvent evt)\r
{\r
+\r
int seq = 0;\r
int y = evt.getY();\r
\r
if (av.wrapAlignment)\r
{\r
- y -= (2 * av.charHeight);\r
- int chunkHeight = (av.getAlignment().getHeight() + 2) * av.charHeight;\r
- seq = ( (y % chunkHeight) / av.getCharHeight());\r
+ int hgap = av.charHeight;\r
+ if (av.scaleAboveWrapped)\r
+ hgap += av.charHeight;\r
+\r
+ int cHeight = av.getAlignment().getHeight() * av.charHeight\r
+ + hgap + seqCanvas.getAnnotationHeight();\r
+\r
+ y -= hgap;\r
+\r
+ seq = ( (y % cHeight) / av.getCharHeight());\r
}\r
else\r
{\r
\r
if (res > sequence.getLength())\r
{\r
- return;\r
- }\r
+ return;\r
+ }\r
\r
- Object obj = ResidueProperties.aa2Triplet.get(sequence.getCharAt(res) +\r
- "");\r
- String aa = "";\r
+ if(seqCanvas.pdbCanvas!=null && sequence==seqCanvas.pdbCanvas.sequence)\r
+ {\r
+ seqCanvas.pdbCanvas.highlightRes(sequence.findPosition(res));\r
+ }\r
\r
- if (obj != null)\r
- {\r
- aa = obj.toString();\r
- }\r
\r
StringBuffer text = new StringBuffer("Sequence " + (seq + 1) + " ID: " +\r
sequence.getName());\r
\r
- if (aa != "")\r
+ Object obj = null;\r
+ if (av.alignment.isNucleotide())\r
+ {\r
+ obj = ResidueProperties.nucleotideName.get(sequence.getCharAt(res) +\r
+ "");\r
+ if(obj!=null)\r
+ text.append(" Nucleotide: ");\r
+ }\r
+ else\r
{\r
- text.append(" Residue: " + aa + " (" +\r
- av.getAlignment().getSequenceAt(seq).findPosition(res) + ")");\r
+ obj = ResidueProperties.aa2Triplet.get(sequence.getCharAt(res) + "");\r
+ if(obj!=null)\r
+ text.append(" Residue: ");\r
+ }\r
+\r
+ if (obj != null)\r
+ {\r
+\r
+ if (obj != "")\r
+ {\r
+ text.append( obj + " (" +\r
+ av.getAlignment().getSequenceAt(seq).findPosition(res) + ")");\r
+ }\r
}\r
\r
ap.alignFrame.statusBar.setText(text.toString());\r
// use aa to see if the mouse pointer is on a\r
if (av.showSequenceFeatures)\r
{\r
- Vector features = sequence.getSequenceFeatures();\r
- Enumeration e = features.elements();\r
- StringBuffer sbuffer = new StringBuffer();\r
-\r
- while (e.hasMoreElements())\r
+ Vector features = sequence.getDatasetSequence().getSequenceFeatures();\r
+ if(features!=null)\r
{\r
- SequenceFeature sf = (SequenceFeature) e.nextElement();\r
+ StringBuffer sbuffer = new StringBuffer("<html>");\r
\r
- if ((sf.getStart() <= sequence.findPosition(res)) &&\r
- (sf.getEnd() >= sequence.findPosition(res)))\r
+ for (int i = 0; i < features.size(); i++)\r
+ {\r
+ SequenceFeature sf = (SequenceFeature) features.elementAt(i);\r
+\r
+ if ( (sf.getBegin() <= sequence.findPosition(res)) &&\r
+ (sf.getEnd() >= sequence.findPosition(res)))\r
{\r
- if (sbuffer.length() > 0)\r
+ if (sf.getType().equals("disulfide bond"))\r
+ {\r
+ if (sf.getBegin() == sequence.findPosition(res)\r
+ || sf.getEnd() == sequence.findPosition(res))\r
{\r
- sbuffer.append("; ");\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
+ 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
- sbuffer.append(sf.getType() + " " + sf.getDescription());\r
-\r
- if (sf.getStatus().length() > 0)\r
+ if (sf.getStatus() != null)\r
{\r
- sbuffer.append(" (" + sf.getStatus() + ")");\r
+ sbuffer.append(" (" + sf.getStatus() + ")");\r
}\r
+ }\r
}\r
- }\r
\r
- this.setToolTipText(sbuffer.toString());\r
+ }\r
+\r
+ sbuffer.append("</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
ap.alignFrame.updateEditMenuBar();\r
}\r
\r
- av.updateConservation();\r
- av.updateConsensus();\r
-\r
- //Does the edit affect any groups?\r
- //////////////////////////////\r
- Vector groupsToUpdate = new Vector();\r
- SequenceGroup sg = av.getSelectionGroup();\r
+ av.firePropertyChange("alignment", null,av.getAlignment().getSequences());\r
\r
- int s, g, gSize = av.alignment.getGroups().size();\r
- if (sg != null)\r
- {\r
- groupsToUpdate.addElement(av.getSelectionGroup());\r
- int sSize = sg.getSize();\r
- for (s = 0; s < sSize; s++)\r
- {\r
- SequenceI seq = sg.getSequenceAt(s);\r
-\r
- for (g = 0; g < gSize; g++)\r
- {\r
- SequenceGroup sg2 = (SequenceGroup) av.alignment.getGroups().\r
- elementAt(\r
- g);\r
- if (sg2.sequences.contains(seq))\r
- {\r
- if (!groupsToUpdate.contains(sg2))\r
- groupsToUpdate.addElement(sg2);\r
- continue;\r
- }\r
- }\r
- }\r
- }\r
- else\r
- {\r
- SequenceI seq = av.alignment.getSequenceAt(startseq);\r
- for (g = 0; g < gSize; g++)\r
- {\r
- SequenceGroup sg2 = (SequenceGroup) av.alignment.getGroups().elementAt(\r
- g);\r
- if (sg2.sequences.contains(seq))\r
- {\r
- if (!groupsToUpdate.contains(sg2))\r
- groupsToUpdate.addElement(sg2);\r
- continue;\r
- }\r
- }\r
- }\r
-\r
- gSize = groupsToUpdate.size();\r
- for (g = 0; g < gSize; g++)\r
- {\r
- ( (SequenceGroup) groupsToUpdate.elementAt(g)).recalcConservation();\r
- }\r
- ////End of updating groups\r
- //////////////////////////////////////////\r
-\r
- // Y O Y CLUSTALX\r
- ColourSchemeI cs = av.getGlobalColourScheme();\r
- if(cs!=null)\r
- {\r
- if (cs.conservationApplied())\r
- {\r
- Conservation c = new Conservation("All",\r
- ResidueProperties.propHash, 3,\r
- av.alignment.getSequences(),\r
- 0, av.alignment.getWidth() - 1);\r
- c.calculate();\r
- c.verdict(false, av.ConsPercGaps);\r
-\r
- if (cs instanceof ClustalxColourScheme)\r
- {\r
- ((ClustalxColourScheme)cs).\r
- resetClustalX(av.alignment.getSequences(),\r
- av.alignment.getWidth());\r
-\r
- cs.setConservation(c);\r
- av.setGlobalColourScheme(cs);\r
- }\r
- else\r
- {\r
- cs.setConservation(c);\r
- av.setGlobalColourScheme(cs);\r
- }\r
-\r
- }\r
-\r
- if (cs instanceof ClustalxColourScheme)\r
- {\r
- ( (ClustalxColourScheme) cs).resetClustalX(av.alignment.getSequences(),\r
- av.alignment.getWidth());\r
- av.setGlobalColourScheme(cs);\r
- }\r
- }\r
}\r
\r
/**\r
int seq = findSeq(evt);\r
oldSeq = seq;\r
\r
- if(seq<0 || res<0)\r
+ startWrapBlock=wrappedBlock;\r
+\r
+ if(av.wrapAlignment && seq>av.alignment.getHeight())\r
+ {\r
+ JOptionPane.showInternalMessageDialog(Desktop.desktop,\r
+ "Cannot edit annotations in wrapped view.",\r
+ "Wrapped view - no edit",\r
+ JOptionPane.WARNING_MESSAGE);\r
return;\r
+ }\r
+\r
+ if(seq<0 || res<0)\r
+ return;\r
+\r
\r
SequenceI sequence = (Sequence) av.getAlignment().getSequenceAt(seq);\r
\r
int res = findRes(evt);\r
int y = findSeq(evt);\r
\r
+ if(wrappedBlock!=startWrapBlock)\r
+ return;\r
+\r
if (stretchGroup == null)\r
{\r
return;\r
\r
try\r
{\r
- Thread.sleep(75);\r
+ Thread.sleep(20);\r
}\r
catch (Exception ex)\r
{\r