ap.repaint();\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
- int cwidth = seqCanvas.getWrappedCanvasWidth(this.getSize().width);\r
- int block = y/chunkHeight;\r
- block += av.getStartRes()/cwidth;\r
\r
- res = block*cwidth + x / av.getCharWidth();\r
+ int cwidth = seqCanvas.getWrappedCanvasWidth(getSize().width);\r
+\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
int res = findRes(evt);\r
int seq = findSeq(evt);\r
\r
- if (seq >= av.getAlignment().getHeight() || seq<0)\r
+ if (seq >= av.getAlignment().getHeight() || seq<0 || res<0)\r
{\r
return;\r
}\r
return;\r
}\r
\r
- Object obj = ResidueProperties.aa2Triplet.get(sequence.getCharAt(res) + "");\r
- String aa = "";\r
+ StringBuffer text = new StringBuffer("Sequence " + (seq + 1) + " ID: " +\r
+ sequence.getName());\r
+\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
+ obj = ResidueProperties.aa2Triplet.get(sequence.getCharAt(res) + "");\r
+ if(obj!=null)\r
+ text.append(" Residue: ");\r
+ }\r
+\r
if (obj != null)\r
{\r
- aa = obj.toString();\r
+\r
+ if (obj != "")\r
+ {\r
+ text.append(obj + " (" +\r
+ av.getAlignment().getSequenceAt(seq).findPosition(res) + ")");\r
+ }\r
}\r
\r
- StringBuffer text = new StringBuffer("Sequence " + (seq + 1) + " ID: " +\r
- sequence.getName());\r
- if (aa != "")\r
+ if(seqCanvas.pdbCanvas!=null && sequence==seqCanvas.pdbCanvas.sequence)\r
{\r
- text.append(" Residue: " + aa + " (" +\r
- av.getAlignment().getSequenceAt(seq).findPosition(res) + ")");\r
+ seqCanvas.pdbCanvas.highlightRes(sequence.findPosition(res));\r
}\r
\r
ap.alignFrame.statusBar.setText(text.toString());\r
while (e.hasMoreElements())\r
{\r
SequenceFeature sf = (SequenceFeature) e.nextElement();\r
- if (sf.getStart() <= sequence.findPosition(res) &&\r
+ if (sf.getBegin() <= sequence.findPosition(res) &&\r
sf.getEnd() >= sequence.findPosition(res))\r
{\r
if (sbuffer.length() > 0)\r
ap.alignFrame.updateEditMenuBar();\r
}\r
\r
- av.updateConservation();\r
- av.updateConsensus();\r
-\r
-\r
- //Does the edit affect any groups?\r
- //////////////////////////////\r
- Vector groupsToUpdate = new Vector();\r
- SequenceGroup sg = av.getSelectionGroup();\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
-\r
- // Y O Y CLUSTALX\r
- ColourSchemeI cs = av.getGlobalColourScheme();\r
-\r
- if (av.getSelectionGroup() != null)\r
- {\r
- av.getSelectionGroup().recalcConservation();\r
- }\r
-\r
- if(cs!=null)\r
- {\r
- if (cs.conservationApplied())\r
- {\r
- jalview.analysis.Conservation c = new jalview.analysis.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
- 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
+ av.firePropertyChange("alignment", null,av.getAlignment().getSequences());\r
}\r
\r
//////////////////////////////////////////\r
int res = findRes(evt);\r
int seq = findSeq(evt);\r
oldSeq = seq;\r
+ startWrapBlock=wrappedBlock;\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(y>=av.alignment.getHeight())\r
y = av.alignment.getHeight()-1;\r
\r
return;\r
}\r
\r
- if (res > av.alignment.getWidth() && !av.getWrapAlignment())\r
+ if (res > av.alignment.getWidth())\r
{\r
res = av.alignment.getWidth() - 1;\r
}\r