{\r
public void mouseMoved(MouseEvent evt)\r
{\r
- if (av.getWrapAlignment())\r
- {\r
- return;\r
- }\r
doMouseMoved(evt);\r
}\r
\r
public void mouseDragged(MouseEvent evt)\r
{\r
- if (av.getWrapAlignment())\r
- {\r
- return;\r
- }\r
if (editingSeqs)\r
{\r
doMouseDragged(evt);\r
{\r
public void mouseReleased(MouseEvent evt)\r
{\r
- if (av.getWrapAlignment())\r
- {\r
- return;\r
- }\r
if (editingSeqs)\r
{\r
doMouseReleased(evt);\r
\r
public void mousePressed(MouseEvent evt)\r
{\r
- if (av.getWrapAlignment())\r
- {\r
- return;\r
- }\r
if (evt.isShiftDown() || evt.isAltDown() || evt.isControlDown())\r
{\r
if (evt.isAltDown() || evt.isControlDown())\r
\r
public void mouseExited(MouseEvent evt)\r
{\r
- if (av.getWrapAlignment() || editingSeqs)\r
+ if (editingSeqs)\r
{\r
return;\r
}\r
\r
public void mouseEntered(MouseEvent evt)\r
{\r
- if (av.getWrapAlignment() || editingSeqs)\r
+ if (editingSeqs)\r
{\r
return;\r
}\r
ap.repaint();\r
}\r
\r
+ int startWrapBlock=-1;\r
+ int wrappedBlock=-1;\r
+ int findRes(MouseEvent evt)\r
+ {\r
+ int res = 0;\r
+ int x = evt.getX();\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 -= hgap;\r
+ x -= seqCanvas.LABEL_WEST;\r
+\r
+\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
+ res = (x / av.getCharWidth()) + av.getStartRes();\r
+ }\r
+\r
+ return res;\r
+\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
+ 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
+ seq = (y / av.getCharHeight()) + av.getStartSeq();\r
+ }\r
+\r
+ return seq;\r
+ }\r
+\r
+\r
public void doMousePressed(MouseEvent evt)\r
{\r
ap.alignFrame.addHistoryItem(new HistoryItem(\r
"Edit Sequence", av.alignment, HistoryItem.EDIT));\r
- int seq;\r
- int res;\r
-\r
- int x = evt.getX();\r
- int y = evt.getY();\r
\r
- res = x / av.getCharWidth() + av.getStartRes();\r
- seq = y / av.getCharHeight() + av.getStartSeq();\r
+ int seq = findSeq(evt);\r
+ int res = findRes(evt);\r
\r
if (seq < av.getAlignment().getHeight() &&\r
res < av.getAlignment().getSequenceAt(seq).getLength())\r
\r
public void doMouseMoved(MouseEvent evt)\r
{\r
- int res = 0, seq = 0;\r
- int x = evt.getX();\r
- int y = evt.getY();\r
- if (av.wrapAlignment)\r
- {\r
- y -= 2 * av.charHeight;\r
- int chunkHeight = (av.getAlignment().getHeight() + 2) * av.charHeight;\r
-\r
- res = (int) ( (y / chunkHeight) * (getSize().width / av.charWidth)) +\r
- x / av.getCharWidth() + av.getStartRes();\r
-\r
- y %= chunkHeight;\r
- seq = y / av.getCharHeight() + av.getStartSeq();\r
+ int res = findRes(evt);\r
+ int seq = findSeq(evt);\r
\r
- }\r
- else\r
- {\r
- res = x / av.getCharWidth() + av.getStartRes();\r
- seq = y / av.getCharHeight() + av.getStartSeq();\r
- }\r
-\r
- if (seq >= av.getAlignment().getHeight())\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
- if (obj != null)\r
+ StringBuffer text = new StringBuffer("Sequence " + (seq + 1) + " ID: " +\r
+ sequence.getName());\r
+\r
+ Object obj = null;\r
+ if (av.alignment.isNucleotide())\r
{\r
- aa = obj.toString();\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
- StringBuffer text = new StringBuffer("Sequence " + (seq + 1) + " ID: " +\r
- sequence.getName());\r
- if (aa != "")\r
+ if (obj != null)\r
{\r
- text.append(" Residue: " + aa + " (" +\r
- av.getAlignment().getSequenceAt(seq).findPosition(res) + ")");\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
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
{\r
\r
// If we're dragging we're editing\r
- int res = evt.getX() / av.getCharWidth() + av.getStartRes();\r
+ int res = findRes(evt);\r
if (res < 0)\r
{\r
res = 0;\r
{\r
if (endEdit == startEdit)\r
{\r
- ap.alignFrame.historyList.pop();\r
- ap.alignFrame.updateEditMenuBar();\r
- }\r
-\r
- av.updateConservation();\r
- av.updateConsensus();\r
-\r
- // Y O Y CLUSTALX\r
- ColourSchemeI cs = av.getGlobalColourScheme();\r
- if (cs instanceof ConservationColourScheme)\r
- {\r
- ConservationColourScheme ccs = (ConservationColourScheme) cs;\r
- if (ccs.cs instanceof ClustalxColourScheme)\r
- {\r
- jalview.analysis.Conservation c = new jalview.analysis.Conservation\r
- ("All",\r
- ResidueProperties.propHash, 3,\r
- av.alignment.getSequences(), 0,\r
- av.alignment.getWidth() - 1);\r
- c.calculate();\r
- c.verdict(false, av.ConsPercGaps);\r
-\r
- ClustalxColourScheme cxs = (ClustalxColourScheme) ccs.cs;\r
- cxs.resetClustalX(av.alignment.getSequences(), av.alignment.getWidth());\r
- ccs = new ConservationColourScheme(c, cxs);\r
- av.setGlobalColourScheme(ccs);\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
+ ap.alignFrame.historyList.pop();\r
+ ap.alignFrame.updateEditMenuBar();\r
}\r
\r
+ av.firePropertyChange("alignment", null,av.getAlignment().getSequences());\r
}\r
\r
//////////////////////////////////////////\r
int oldSeq = -1;\r
public void doMousePressedDefineMode(MouseEvent evt)\r
{\r
- int res = evt.getX() / av.getCharWidth() + av.getStartRes();\r
- int seq = evt.getY() / av.getCharHeight() + av.getStartSeq();\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
SequenceGroup sg = new SequenceGroup();\r
sg.setStartRes(res);\r
sg.setEndRes(res);\r
- sg.addSequence(sequence);\r
+ sg.addSequence(sequence, false);\r
av.setSelectionGroup(sg);\r
stretchGroup = sg;\r
\r
else if ( (evt.getModifiers() & InputEvent.BUTTON3_MASK) ==\r
InputEvent.BUTTON3_MASK)\r
{\r
- APopupMenu popup = new APopupMenu(ap, null);\r
+ APopupMenu popup = new APopupMenu(ap, null, null);\r
this.add(popup);\r
popup.show(this, evt.getX(), evt.getY());\r
}\r
\r
public void doMouseReleasedDefineMode(MouseEvent evt)\r
{\r
- mouseDragging = false;\r
+ if(mouseDragging)\r
+ {\r
+ stretchGroup.recalcConservation();\r
+ mouseDragging = false;\r
+ }\r
\r
if (stretchGroup == null)\r
{\r
return;\r
}\r
\r
- if (stretchGroup.cs instanceof ClustalxColourScheme)\r
- {\r
- stretchGroup.cs = new ClustalxColourScheme(stretchGroup.sequences,\r
- av.alignment.getWidth());\r
- seqCanvas.repaint();\r
- }\r
-\r
- else if (stretchGroup.cs instanceof ConservationColourScheme)\r
+ if(stretchGroup.cs!=null)\r
{\r
- ConservationColourScheme ccs = (ConservationColourScheme) stretchGroup.cs;\r
- stretchGroup.cs = ccs;\r
- SliderPanel.setConservationSlider(ap, stretchGroup.cs,\r
- stretchGroup.getName());\r
-\r
- seqCanvas.repaint();\r
- }\r
- else\r
- {\r
- if (stretchGroup.cs != null)\r
+ if (stretchGroup.cs.conservationApplied())\r
+ {\r
+ SliderPanel.setConservationSlider(ap, stretchGroup.cs,\r
+ stretchGroup.getName());\r
+ }\r
+ else\r
{\r
SliderPanel.setPIDSliderSource(ap, stretchGroup.cs,\r
stretchGroup.getName());\r
}\r
-\r
}\r
-\r
changeEndRes = false;\r
changeStartRes = false;\r
stretchGroup = null;\r
+ seqCanvas.repaint();\r
ap.repaint();\r
}\r
\r
boolean remove = false;\r
public void doMouseDraggedDefineMode(MouseEvent evt)\r
{\r
- int res = evt.getX() / av.getCharWidth() + av.getStartRes();\r
- int y = evt.getY() / av.getCharHeight() + av.getStartSeq();\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
if (stretchGroup == null)\r
{\r
{\r
res = av.getStartRes();\r
}\r
- else if (res > av.getEndRes())\r
+ else if (res > av.getEndRes() && !av.getWrapAlignment())\r
{\r
res = av.getEndRes();\r
}\r
\r
if (stretchGroup.sequences.contains(nextSeq))\r
{\r
- stretchGroup.deleteSequence(seq);\r
- stretchGroup.deleteSequence(nextSeq);\r
+ stretchGroup.deleteSequence(seq, false);\r
}\r
else\r
{\r
if (seq != null)\r
{\r
- stretchGroup.addSequence(seq);\r
+ stretchGroup.addSequence(seq, false);\r
}\r
- stretchGroup.addSequence(nextSeq);\r
+ stretchGroup.addSequence(nextSeq, false);\r
}\r
}\r
oldSeq = y;\r
\r
public void doMouseExitedDefineMode(MouseEvent e)\r
{\r
- if (av.getWrapAlignment())\r
- {\r
- return;\r
- }\r
-\r
if (mouseDragging)\r
{\r
scrollThread = new ScrollThread();\r
}\r
-\r
}\r
\r
// this class allows scrolling off the bottom of the visible alignment\r
git://source.jalview.org / jalview.git / blobdiff