+/*\r
+ * Jalview - A Sequence Alignment Editor and Viewer\r
+ * Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle\r
+ *\r
+ * This program is free software; you can redistribute it and/or\r
+ * modify it under the terms of the GNU General Public License\r
+ * as published by the Free Software Foundation; either version 2\r
+ * of the License, or (at your option) any later version.\r
+ *\r
+ * This program is distributed in the hope that it will be useful,\r
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\r
+ * GNU General Public License for more details.\r
+ *\r
+ * You should have received a copy of the GNU General Public License\r
+ * along with this program; if not, write to the Free Software\r
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA\r
+ */\r
package jalview.gui;\r
\r
+import java.util.*;\r
+\r
import java.awt.*;\r
import java.awt.event.*;\r
-import jalview.datamodel.*;\r
import javax.swing.*;\r
-import java.util.*;\r
-import jalview.schemes.*;\r
-import jalview.analysis.*;\r
\r
+import jalview.analysis.*;\r
+import jalview.datamodel.*;\r
+import jalview.schemes.*;\r
\r
-public class SeqPanel extends JPanel\r
+public class SeqPanel\r
+ extends JPanel\r
{\r
-\r
- public SeqCanvas seqCanvas;\r
- public AlignmentPanel ap;\r
-\r
- protected int startres;\r
+ public SeqCanvas seqCanvas;\r
+ public AlignmentPanel ap;\r
protected int lastres;\r
- protected int endres;\r
-\r
protected int startseq;\r
- protected int padseq;\r
-\r
+ int startEdit = -1;\r
+ int endEdit = -1;\r
protected AlignViewport av;\r
\r
// if character is inserted or deleted, we will need to recalculate the conservation\r
int seqEditOccurred = -1;\r
-\r
ScrollThread scrollThread = null;\r
boolean mouseDragging = false;\r
+ boolean editingSeqs = false;\r
+ boolean groupEditing = false;\r
\r
+ //////////////////////////////////////////\r
+ /////Everything below this is for defining the boundary of the rubberband\r
+ //////////////////////////////////////////\r
+ int oldSeq = -1;\r
+ boolean changeEndSeq = false;\r
+ boolean changeStartSeq = false;\r
+ boolean changeEndRes = false;\r
+ boolean changeStartRes = false;\r
+ SequenceGroup stretchGroup = null;\r
+ boolean remove = false;\r
\r
- public SeqPanel(AlignViewport avp, AlignmentPanel p) {\r
- this.av = avp;\r
+ public SeqPanel(AlignViewport avp, AlignmentPanel p)\r
+ {\r
+ this.av = avp;\r
\r
- seqCanvas = new SeqCanvas(avp);\r
+ seqCanvas = new SeqCanvas(avp);\r
setLayout(new BorderLayout());\r
add(seqCanvas, BorderLayout.CENTER);\r
\r
ap = p;\r
\r
- addMouseMotionListener( new MouseMotionAdapter()\r
+ addMouseMotionListener(new MouseMotionAdapter()\r
{\r
public void mouseMoved(MouseEvent evt)\r
{\r
- if(av.getWrapAlignment())\r
- return;\r
- doMouseMoved(evt); }\r
+ if (av.getWrapAlignment())\r
+ {\r
+ return;\r
+ }\r
+\r
+ doMouseMoved(evt);\r
+ }\r
\r
public void mouseDragged(MouseEvent evt)\r
{\r
- if(av.getWrapAlignment())\r
- return;\r
- if(evt.isShiftDown() || evt.isAltDown() || evt.isControlDown())\r
+ if (av.getWrapAlignment())\r
+ {\r
+ return;\r
+ }\r
+\r
+ if (editingSeqs)\r
+ {\r
doMouseDragged(evt);\r
+ }\r
else\r
+ {\r
doMouseDraggedDefineMode(evt);\r
+ }\r
}\r
});\r
\r
- addMouseListener( new MouseAdapter()\r
+ addMouseListener(new MouseAdapter()\r
{\r
public void mouseReleased(MouseEvent evt)\r
{\r
- if(av.getWrapAlignment())\r
- return;\r
- if(evt.isShiftDown() || evt.isAltDown() || evt.isControlDown())\r
+ if (av.getWrapAlignment())\r
+ {\r
+ return;\r
+ }\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(av.getWrapAlignment())\r
- return;\r
- if(evt.isShiftDown() || evt.isAltDown() || evt.isControlDown())\r
+ if (av.getWrapAlignment())\r
+ {\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
+ editingSeqs = true;\r
doMousePressed(evt);\r
+ }\r
else\r
+ {\r
doMousePressedDefineMode(evt);\r
+ }\r
}\r
+\r
public void mouseExited(MouseEvent evt)\r
{\r
- if (av.getWrapAlignment() || evt.isShiftDown() || evt.isAltDown() ||\r
- evt.isControlDown())\r
- return;\r
- doMouseExitedDefineMode(evt);\r
+ if (av.getWrapAlignment() || editingSeqs)\r
+ {\r
+ return;\r
+ }\r
\r
+ doMouseExitedDefineMode(evt);\r
}\r
+\r
public void mouseEntered(MouseEvent evt)\r
{\r
- if (av.getWrapAlignment() || evt.isShiftDown() || evt.isAltDown() ||\r
- evt.isControlDown())\r
+ if (av.getWrapAlignment() || editingSeqs)\r
+ {\r
return;\r
+ }\r
+\r
doMouseEnteredDefineMode(evt);\r
}\r
-\r
});\r
repaint();\r
}\r
\r
-\r
- public void doMouseReleased(MouseEvent evt) {\r
-\r
- int x = evt.getX();\r
- int res = x/av.getCharWidth() + av.getStartRes();\r
-\r
- endres = res;\r
+ public void doMouseReleased(MouseEvent evt)\r
+ {\r
+ if (seqEditOccurred > -1)\r
+ {\r
+ editOccurred(seqEditOccurred);\r
+ }\r
\r
startseq = -1;\r
- startres = -1;\r
- lastres = -1;\r
- if(seqEditOccurred>-1)\r
- updateConservation(seqEditOccurred);\r
-\r
+ lastres = -1;\r
seqEditOccurred = -1;\r
+ editingSeqs = false;\r
+ groupEditing = false;\r
\r
- ap.RefreshPanels();\r
- repaint();\r
-\r
+ ap.repaint();\r
}\r
\r
- public void doMousePressed(MouseEvent evt) {\r
- ap.alignFrame.addHistoryItem("sequence edit");\r
+ public void doMousePressed(MouseEvent evt)\r
+ {\r
+ ap.alignFrame.addHistoryItem(new HistoryItem("Edit Sequence",\r
+ av.alignment, HistoryItem.EDIT));\r
+\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
+ res = (x / av.getCharWidth()) + av.getStartRes();\r
+ seq = (y / av.getCharHeight()) + av.getStartSeq();\r
\r
- if (seq < av.getAlignment().getHeight() &&\r
- res < av.getAlignment().getSequenceAt(seq).getLength())\r
+ if ( (seq < av.getAlignment().getHeight()) &&\r
+ (res < av.getAlignment().getSequenceAt(seq).getLength()))\r
{\r
- //char resstr = align.getSequenceAt(seq).getSequence().charAt(res);\r
- // Find the residue's position in the sequence (res is the position\r
- // in the alignment\r
-\r
startseq = seq;\r
-\r
- if (startseq == (av.getAlignment().getHeight() - 1))\r
- padseq = 1;\r
- else\r
- padseq = 1;\r
-\r
- startres = res;\r
lastres = res;\r
-\r
}\r
else\r
{\r
startseq = -1;\r
- startres = -1;\r
lastres = -1;\r
}\r
\r
+ startEdit = lastres;\r
+ endEdit = lastres;\r
+\r
return;\r
}\r
\r
public void doMouseMoved(MouseEvent evt)\r
{\r
- int res=0, seq=0;\r
+ int res = 0;\r
+ int seq = 0;\r
int x = evt.getX();\r
int y = evt.getY();\r
- if(av.wrapAlignment)\r
+\r
+ if (av.wrapAlignment)\r
{\r
- y -= 2*av.charHeight;\r
- int chunkHeight = (av.getAlignment().getHeight()+2)*av.charHeight;\r
+ y -= (2 * av.charHeight);\r
\r
+ int chunkHeight = (av.getAlignment().getHeight() + 2) * av.charHeight;\r
\r
- res = (int)((y/chunkHeight)*(getWidth()/av.charWidth)) + x/av.getCharWidth() + av.getStartRes();\r
+ res = (int) ( (y / chunkHeight) * (getWidth() / av.charWidth)) +\r
+ (x / av.getCharWidth()) + av.getStartRes();\r
\r
y %= chunkHeight;\r
- seq = y / av.getCharHeight() + av.getStartSeq();\r
-\r
+ seq = (y / av.getCharHeight()) + av.getStartSeq();\r
}\r
else\r
{\r
- res = x / av.getCharWidth() + av.getStartRes();\r
- seq = y / av.getCharHeight() + av.getStartSeq();\r
+ res = (x / av.getCharWidth()) + av.getStartRes();\r
+ seq = (y / av.getCharHeight()) + av.getStartSeq();\r
}\r
\r
-\r
- if(seq>=av.getAlignment().getHeight())\r
+ if (seq >= av.getAlignment().getHeight())\r
+ {\r
return;\r
+ }\r
\r
SequenceI sequence = av.getAlignment().getSequenceAt(seq);\r
- if(res>sequence.getLength())\r
+\r
+ if (res > sequence.getLength())\r
+ {\r
return;\r
+ }\r
\r
- Object obj = ResidueProperties.aa2Triplet.get( sequence.getCharAt(res)+"" ) ;\r
+ Object obj = ResidueProperties.aa2Triplet.get(sequence.getCharAt(res) +\r
+ "");\r
String aa = "";\r
- if(obj!=null)\r
- aa = obj.toString();\r
\r
- StringBuffer text = new StringBuffer("Sequence " +(seq+1)+" ID: "+sequence.getName());\r
- if(aa!="")\r
- text.append(" Residue: "+aa+" ("+ av.getAlignment().getSequenceAt(seq).findPosition(res)+")");\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
+ {\r
+ text.append(" Residue: " + aa + " (" +\r
+ av.getAlignment().getSequenceAt(seq).findPosition(res) + ")");\r
+ }\r
\r
ap.alignFrame.statusBar.setText(text.toString());\r
\r
// use aa to see if the mouse pointer is on a\r
- if( av.showSequenceFeatures)\r
+ if (av.showSequenceFeatures)\r
{\r
Vector features = sequence.getSequenceFeatures();\r
Enumeration e = features.elements();\r
StringBuffer sbuffer = new StringBuffer();\r
\r
-\r
while (e.hasMoreElements())\r
{\r
SequenceFeature sf = (SequenceFeature) e.nextElement();\r
- if (sf.getStart() <= sequence.findPosition(res) &&\r
- sf.getEnd() >= sequence.findPosition(res))\r
+\r
+ if ( (sf.getStart() <= sequence.findPosition(res)) &&\r
+ (sf.getEnd() >= sequence.findPosition(res)))\r
{\r
- if(sbuffer.length()>0)\r
+ if (sbuffer.length() > 0)\r
+ {\r
sbuffer.append("; ");\r
+ }\r
+\r
sbuffer.append(sf.getType() + " " + sf.getDescription());\r
- if(sf.getStatus().length()>0)\r
- sbuffer.append(" ("+sf.getStatus()+")");\r
- }\r
\r
+ if (sf.getStatus().length() > 0)\r
+ {\r
+ sbuffer.append(" (" + sf.getStatus() + ")");\r
+ }\r
+ }\r
}\r
\r
ToolTipManager.sharedInstance().registerComponent(this);\r
this.setToolTipText(sbuffer.toString());\r
}\r
-\r
-\r
}\r
\r
- public void doMouseDragged(MouseEvent evt) {\r
+ public void doMouseDragged(MouseEvent evt)\r
+ {\r
// If we're dragging we're editing\r
+ int res = (evt.getX() / av.getCharWidth()) + av.getStartRes();\r
+\r
+ if (res < 0)\r
+ {\r
+ res = 0;\r
+ }\r
\r
- if(lastres==-1)\r
+ if ( (lastres == -1) || (lastres == res))\r
+ {\r
return;\r
+ }\r
\r
- int x = evt.getX();\r
+ boolean dragRight = true;\r
\r
- int res = x/av.getCharWidth() + av.getStartRes();\r
- if (res < 0)\r
- res = 0;\r
+ if ( (res < av.getAlignment().getWidth()) && (res < lastres))\r
+ {\r
+ dragRight = false;\r
+ }\r
\r
if (res != lastres)\r
{\r
- // Group editing\r
- if (evt.isAltDown() || evt.isControlDown())\r
+ // Group editing\r
+ if (groupEditing)\r
+ {\r
+ SequenceGroup sg = av.getSelectionGroup();\r
+\r
+ if (sg == null)\r
{\r
- SequenceGroup sg = av.getSelectionGroup();\r
- if(sg==null)\r
- av.getAlignment().findGroup(startseq);\r
- if (sg != null)\r
+ lastres = -1;\r
+\r
+ return;\r
+ }\r
+\r
+ // drag to right\r
+ if (dragRight)\r
+ {\r
+ sg.setEndRes(sg.getEndRes() + (res - lastres));\r
+ }\r
+ // drag to left\r
+ else\r
+ {\r
+ /// Are we able to delete?\r
+ // ie are all columns blank?\r
+ boolean deleteAllowed = false;\r
+\r
+ for (int s = 0; s < sg.getSize(); s++)\r
{\r
- boolean deleteAllowed = false;\r
- if (res < av.getAlignment().getWidth() && res < lastres)\r
+ SequenceI seq = sg.getSequenceAt(s);\r
+\r
+ for (int j = res; j < lastres; j++)\r
{\r
- /// Are we able to delete?\r
- boolean allGaps = true;\r
- for (int i = 0; i < sg.getSize(); i++)\r
+ if (seq.getSequence().length() <= j)\r
{\r
- SequenceI s = sg.getSequenceAt(i);\r
- for (int j = lastres-1; j >= res && allGaps; j--)\r
- {\r
- if (!jalview.util.Comparison.isGap(s.getSequence().charAt(j)))\r
- {\r
- res = j + 1;\r
- allGaps = false;\r
- }\r
- }\r
-\r
- if(!deleteAllowed && allGaps)\r
- deleteAllowed = true;\r
+ continue;\r
}\r
- }\r
\r
- // drag to right\r
- if (res < av.getAlignment().getWidth() && res > lastres)\r
- sg.setEndRes(sg.getEndRes() + 1);\r
+ if (!jalview.util.Comparison.isGap(\r
+ seq.getSequence().charAt(j)))\r
+ {\r
+ // Not a gap, block edit not valid\r
+ res = j + 1;\r
+ deleteAllowed = false;\r
\r
- // drag to left\r
- else if (deleteAllowed && res < av.getAlignment().getWidth() &&\r
- res < lastres)\r
- sg.setEndRes(sg.getEndRes() - 1);\r
+ continue;\r
+ }\r
\r
+ deleteAllowed = true;\r
+ }\r
+ }\r
\r
+ if (!deleteAllowed)\r
+ {\r
+ lastres = -1;\r
\r
+ return;\r
+ }\r
\r
- for (int i = 0; i < sg.getSize(); i++)\r
- {\r
- SequenceI s = sg.getSequenceAt(i);\r
- int k = av.alignment.findIndex(s);\r
+ sg.setEndRes(sg.getEndRes() - (lastres - res));\r
+ }\r
\r
- // drag to right\r
- if (res < av.getAlignment().getWidth() && res > lastres)\r
- for (int j = lastres; j < res; j++)\r
- insertChar(j, k);\r
+ for (int i = 0; i < sg.getSize(); i++)\r
+ {\r
+ SequenceI s = sg.getSequenceAt(i);\r
+ int k = av.alignment.findIndex(s);\r
\r
- // drag to left\r
- else if (deleteAllowed && res < av.getAlignment().getWidth() && res < lastres)\r
+ // drag to right\r
+ if (dragRight)\r
+ {\r
+ for (int j = lastres; j < res; j++)\r
+ {\r
+ insertChar(j, k);\r
+ }\r
+ }\r
+ // drag to left\r
+ else\r
+ {\r
+ for (int j = res; j < lastres; j++)\r
+ {\r
+ if (s.getLength() > j)\r
{\r
- for (int j = res; j < lastres; j++)\r
- {\r
- deleteChar(j, k);\r
- startres = res;\r
- }\r
+ deleteChar(res, k);\r
}\r
}\r
}\r
}\r
- else /////Editing a single sequence///////////\r
+ }\r
+ else /////Editing a single sequence///////////\r
+ {\r
+ if ( (res < av.getAlignment().getWidth()) && (res > lastres))\r
{\r
- if (res < av.getAlignment().getWidth() && res > lastres)\r
+ // dragging to the right\r
+ for (int j = lastres; j < res; j++)\r
{\r
- // dragging to the right\r
- for (int j = lastres; j < res; j++)\r
- insertChar(j, startseq);\r
+ insertChar(j, startseq);\r
}\r
- else if (res < av.getAlignment().getWidth() && res < lastres)\r
+ }\r
+ else if ( (res < av.getAlignment().getWidth()) &&\r
+ (res < lastres))\r
+ {\r
+ // dragging to the left\r
+ for (int j = lastres; j > res; j--)\r
{\r
- // dragging to the left\r
- for (int j = res; j < lastres; j++)\r
+ if (jalview.util.Comparison.isGap(\r
+ av.alignment.getSequenceAt(startseq)\r
+ .getSequence().charAt(res)))\r
{\r
- deleteChar(j, startseq);\r
- startres = res;\r
+ deleteChar(res, startseq);\r
}\r
- }\r
-\r
- }\r
-\r
+ else\r
+ {\r
+ break;\r
+ }\r
+ }\r
+ }\r
+ }\r
}\r
\r
+ endEdit = res;\r
lastres = res;\r
repaint();\r
}\r
\r
- public void drawChars(int seqstart, int seqend, int start) {\r
- seqCanvas.drawPanel(seqCanvas.gg, start,av.getEndRes(),seqstart,seqend,av.getStartRes(),av.getStartSeq(),0);\r
+ public void drawChars(int seqstart, int seqend, int start)\r
+ {\r
+ seqCanvas.drawPanel(seqCanvas.gg, start, av.getEndRes(), seqstart,\r
+ seqend, av.getStartRes(), av.getStartSeq(), 0);\r
repaint();\r
}\r
\r
public void insertChar(int j, int seq)\r
{\r
av.alignment.getSequenceAt(seq).insertCharAt(j, av.getGapCharacter());\r
- seqEditOccurred=seq;\r
+ seqEditOccurred = seq;\r
}\r
\r
public void deleteChar(int j, int seq)\r
{\r
-\r
- if ( jalview.util.Comparison.isGap( av.alignment.getSequenceAt(seq).getSequence().charAt(j)))\r
- av.alignment.getSequenceAt(seq).deleteCharAt(j);\r
+ av.alignment.getSequenceAt(seq).deleteCharAt(j);\r
+ seqEditOccurred = seq;\r
\r
av.alignment.getWidth();\r
repaint();\r
- seqEditOccurred=seq;\r
}\r
\r
-\r
- void updateConservation(int i)\r
+ void editOccurred(int i)\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
+\r
+ if (cs instanceof ConservationColourScheme)\r
+ {\r
+ ConservationColourScheme ccs = (ConservationColourScheme) cs;\r
+\r
+ if (ccs.cs instanceof ClustalxColourScheme)\r
+ {\r
+ Conservation c = new Conservation("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(),\r
+ 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
+ }\r
}\r
\r
-//////////////////////////////////////////\r
-/////Everything below this is for defining the boundary of the rubberband\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 = (evt.getX() / av.getCharWidth()) + av.getStartRes();\r
+ int seq = (evt.getY() / av.getCharHeight()) + av.getStartSeq();\r
oldSeq = seq;\r
\r
SequenceI sequence = (Sequence) av.getAlignment().getSequenceAt(seq);\r
\r
- if(sequence==null || res>sequence.getLength())\r
+ if ( (sequence == null) || (res > sequence.getLength()))\r
+ {\r
return;\r
+ }\r
\r
stretchGroup = av.getSelectionGroup();\r
\r
- if(stretchGroup == null)\r
- {\r
- stretchGroup = av.alignment.findGroup( sequence );\r
- if(stretchGroup!=null && res>stretchGroup.getStartRes() && res<stretchGroup.getEndRes())\r
- av.setSelectionGroup(stretchGroup);\r
- else\r
- stretchGroup = null;\r
- }\r
-\r
- else if(!stretchGroup.sequences.contains(sequence)\r
- || stretchGroup.getStartRes()>res\r
- || stretchGroup.getEndRes()<res)\r
- {\r
- stretchGroup = null;\r
-\r
- SequenceGroup[] allGroups = av.alignment.findAllGroups( sequence );\r
-\r
- if (allGroups != null)\r
- for (int i = 0; i < allGroups.length; i++)\r
- if (allGroups[i].getStartRes() <= res &&\r
- allGroups[i].getEndRes() >= res)\r
- {\r
- stretchGroup = allGroups[i];\r
- av.setSelectionGroup(stretchGroup);\r
- break;\r
- }\r
- }\r
-\r
- if(stretchGroup==null)\r
+ if (stretchGroup == null)\r
+ {\r
+ stretchGroup = av.alignment.findGroup(sequence);\r
+\r
+ if ( (stretchGroup != null) && (res > stretchGroup.getStartRes()) &&\r
+ (res < stretchGroup.getEndRes()))\r
+ {\r
+ av.setSelectionGroup(stretchGroup);\r
+ }\r
+ else\r
+ {\r
+ stretchGroup = null;\r
+ }\r
+ }\r
+ else if (!stretchGroup.sequences.contains(sequence) ||\r
+ (stretchGroup.getStartRes() > res) ||\r
+ (stretchGroup.getEndRes() < res))\r
+ {\r
+ stretchGroup = null;\r
+\r
+ SequenceGroup[] allGroups = av.alignment.findAllGroups(sequence);\r
+\r
+ if (allGroups != null)\r
+ {\r
+ for (int i = 0; i < allGroups.length; i++)\r
+ {\r
+ if ( (allGroups[i].getStartRes() <= res) &&\r
+ (allGroups[i].getEndRes() >= res))\r
+ {\r
+ stretchGroup = allGroups[i];\r
+ av.setSelectionGroup(stretchGroup);\r
+\r
+ break;\r
+ }\r
+ }\r
+ }\r
+ }\r
+\r
+ if (stretchGroup == null)\r
{\r
// define a new group here\r
SequenceGroup sg = new SequenceGroup();\r
sg.setStartRes(res);\r
sg.setEndRes(res);\r
- sg.addSequence( sequence );\r
- av.setSelectionGroup( sg );\r
+ sg.addSequence(sequence, false);\r
+ av.setSelectionGroup(sg);\r
stretchGroup = sg;\r
\r
- if(av.getConservationSelected())\r
- SliderPanel.setConservationSlider(ap, av.getGlobalColourScheme(), "Background");\r
- if(av.getAbovePIDThreshold())\r
- SliderPanel.setPIDSliderSource(ap, av.getGlobalColourScheme(), "Background");\r
+ if (av.getConservationSelected())\r
+ {\r
+ SliderPanel.setConservationSlider(ap,\r
+ av.getGlobalColourScheme(),\r
+ "Background");\r
+ }\r
\r
+ if (av.getAbovePIDThreshold())\r
+ {\r
+ SliderPanel.setPIDSliderSource(ap, av.getGlobalColourScheme(),\r
+ "Background");\r
+ }\r
}\r
- else if( javax.swing.SwingUtilities.isRightMouseButton(evt))\r
+ else if (javax.swing.SwingUtilities.isRightMouseButton(evt))\r
{\r
- jalview.gui.PopupMenu pop = new jalview.gui.PopupMenu( ap , null);\r
- pop.show(this, evt.getX(), evt.getY());\r
+ jalview.gui.PopupMenu pop = new jalview.gui.PopupMenu(ap, null);\r
+ pop.show(this, evt.getX(), evt.getY());\r
\r
- // edit the properties of existing group\r
+ // edit the properties of existing group\r
}\r
\r
- if(stretchGroup!=null && stretchGroup.getEndRes()==res)\r
+ if ( (stretchGroup != null) && (stretchGroup.getEndRes() == res))\r
+ {\r
// Edit end res position of selected group\r
changeEndRes = true;\r
-\r
- else if(stretchGroup!=null && stretchGroup.getStartRes()==res)\r
+ }\r
+ else if ( (stretchGroup != null) && (stretchGroup.getStartRes() == res))\r
+ {\r
// Edit end res position of selected group\r
changeStartRes = true;\r
+ }\r
\r
+ stretchGroup.getWidth();\r
\r
repaint();\r
-\r
}\r
\r
- boolean changeEndSeq = false;\r
- boolean changeStartSeq = false;\r
- boolean changeEndRes = false;\r
- boolean changeStartRes = false;\r
- SequenceGroup stretchGroup = null;\r
-\r
public void doMouseReleasedDefineMode(MouseEvent evt)\r
{\r
mouseDragging = false;\r
\r
- if(stretchGroup==null)\r
+ if (stretchGroup == null)\r
+ {\r
return;\r
+ }\r
+\r
+ stretchGroup.recalcConservation();\r
\r
- if(stretchGroup.cs instanceof ClustalxColourScheme)\r
+ if (stretchGroup.cs instanceof ClustalxColourScheme)\r
{\r
- stretchGroup.cs = new ClustalxColourScheme(stretchGroup.sequences, av.alignment.getWidth());\r
- repaint();\r
+ stretchGroup.cs = new ClustalxColourScheme(stretchGroup.sequences,\r
+ av.alignment.getWidth());\r
}\r
-\r
- else if(stretchGroup.cs instanceof ConservationColourScheme)\r
+ else if (stretchGroup.cs instanceof ConservationColourScheme)\r
{\r
- ConservationColourScheme ccs = (ConservationColourScheme)stretchGroup.cs;\r
- stretchGroup.cs = ccs;\r
- SliderPanel.setConservationSlider(ap, stretchGroup.cs, stretchGroup.getName()) ;\r
+ ConservationColourScheme ccs = (ConservationColourScheme) stretchGroup.cs;\r
+ stretchGroup.cs = ccs;\r
+ SliderPanel.setConservationSlider(ap, stretchGroup.cs,\r
+ stretchGroup.getName());\r
\r
- repaint();\r
}\r
else\r
{\r
- if(stretchGroup.cs !=null && stretchGroup.cs.canThreshold())\r
- {\r
- ResidueColourScheme rcs = (ResidueColourScheme) stretchGroup.cs;\r
- SliderPanel.setPIDSliderSource(ap, stretchGroup.cs, stretchGroup.getName());\r
- }\r
-\r
+ SliderPanel.setPIDSliderSource(ap, stretchGroup.cs,\r
+ stretchGroup.getName());\r
}\r
\r
-\r
changeEndRes = false;\r
changeStartRes = false;\r
stretchGroup = null;\r
+ repaint();\r
ap.idPanel.repaint();\r
}\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 = (evt.getX() / av.getCharWidth()) + av.getStartRes();\r
+ int y = (evt.getY() / av.getCharHeight()) + av.getStartSeq();\r
\r
- if(stretchGroup==null)\r
+ if (stretchGroup == null)\r
+ {\r
return;\r
+ }\r
\r
- if(res>av.alignment.getWidth()-2)\r
- res = av.alignment.getWidth()-2;\r
-\r
+ if (res > av.alignment.getWidth())\r
+ {\r
+ res = av.alignment.getWidth() - 1;\r
+ }\r
\r
- if(stretchGroup.getEndRes()==res)\r
+ if (stretchGroup.getEndRes() == res)\r
+ {\r
// Edit end res position of selected group\r
changeEndRes = true;\r
-\r
- else if(stretchGroup.getStartRes()==res)\r
+ }\r
+ else if (stretchGroup.getStartRes() == res)\r
+ {\r
// Edit start res position of selected group\r
changeStartRes = true;\r
+ }\r
\r
-\r
- if(res<av.getStartRes())\r
+ if (res < av.getStartRes())\r
+ {\r
res = av.getStartRes();\r
- else if(res>av.getEndRes())\r
+ }\r
+ else if (res > av.getEndRes())\r
+ {\r
res = av.getEndRes();\r
+ }\r
\r
- if(changeEndRes)\r
+ if (changeEndRes)\r
{\r
- if(res>stretchGroup.getStartRes()-1)\r
- stretchGroup.setEndRes( res );\r
+ if (res > (stretchGroup.getStartRes() - 1))\r
+ {\r
+ stretchGroup.setEndRes(res);\r
+ }\r
}\r
- else if(changeStartRes)\r
+ else if (changeStartRes)\r
{\r
- if(res<stretchGroup.getEndRes()+1)\r
- stretchGroup.setStartRes( res );\r
+ if (res < (stretchGroup.getEndRes() + 1))\r
+ {\r
+ stretchGroup.setStartRes(res);\r
+ }\r
}\r
\r
int dragDirection = 0;\r
+\r
if (y > oldSeq)\r
+ {\r
dragDirection = 1;\r
+ }\r
else if (y < oldSeq)\r
+ {\r
dragDirection = -1;\r
+ }\r
\r
- while (y != oldSeq && oldSeq>0 && y<av.alignment.getHeight())\r
+ while ( (y != oldSeq) && (oldSeq > 0) && (y < av.alignment.getHeight()))\r
{\r
// This routine ensures we don't skip any sequences, as the\r
// selection is quite slow.\r
Sequence seq = (Sequence) av.getAlignment().getSequenceAt(oldSeq);\r
\r
oldSeq += dragDirection;\r
+\r
Sequence nextSeq = (Sequence) av.getAlignment().getSequenceAt(oldSeq);\r
\r
if (stretchGroup.sequences.contains(nextSeq))\r
{\r
- stretchGroup.deleteSequence(seq);\r
- stretchGroup.deleteSequence(nextSeq);\r
+ stretchGroup.deleteSequence(seq, false);\r
+ stretchGroup.deleteSequence(nextSeq, false);\r
}\r
else\r
{\r
- if(seq!=null)\r
- stretchGroup.addSequence(seq);\r
- stretchGroup.addSequence(nextSeq);\r
+ if (seq != null)\r
+ {\r
+ stretchGroup.addSequence(seq, false);\r
+ }\r
+\r
+ stretchGroup.addSequence(nextSeq, false);\r
}\r
}\r
+\r
oldSeq = y;\r
mouseDragging = true;\r
- if(scrollThread!=null)\r
+\r
+ if (scrollThread != null)\r
+ {\r
scrollThread.setEvent(evt);\r
+ }\r
\r
repaint();\r
}\r
public void doMouseEnteredDefineMode(MouseEvent e)\r
{\r
if (scrollThread != null)\r
+ {\r
scrollThread.running = false;\r
+ }\r
}\r
\r
public void doMouseExitedDefineMode(MouseEvent e)\r
{\r
if (av.getWrapAlignment())\r
+ {\r
return;\r
+ }\r
\r
- if(mouseDragging)\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
- class ScrollThread extends Thread\r
+ class ScrollThread\r
+ extends Thread\r
{\r
MouseEvent evt;\r
boolean running = false;\r
+\r
public ScrollThread()\r
{\r
start();\r
public void run()\r
{\r
running = true;\r
+\r
while (running)\r
{\r
- if(evt!=null)\r
+ if (evt != null)\r
{\r
-\r
- if (mouseDragging && evt.getY() < 0 && av.getStartSeq() > 0)\r
+ if (mouseDragging && (evt.getY() < 0) &&\r
+ (av.getStartSeq() > 0))\r
+ {\r
running = ap.scrollUp(true);\r
+ }\r
\r
- if (mouseDragging && evt.getY() >= getHeight() &&\r
- av.alignment.getHeight() > av.getEndSeq())\r
+ if (mouseDragging && (evt.getY() >= getHeight()) &&\r
+ (av.alignment.getHeight() > av.getEndSeq()))\r
+ {\r
running = ap.scrollUp(false);\r
+ }\r
\r
- if (mouseDragging && evt.getX() < 0)\r
+ if (mouseDragging && (evt.getX() < 0))\r
+ {\r
running = ap.scrollRight(true);\r
-\r
- else if (mouseDragging && evt.getX() >= getWidth())\r
+ }\r
+ else if (mouseDragging && (evt.getX() >= getWidth()))\r
+ {\r
running = ap.scrollRight(false);\r
+ }\r
}\r
\r
try\r
Thread.sleep(75);\r
}\r
catch (Exception ex)\r
- {}\r
+ {\r
+ }\r
}\r
}\r
+ }\r
}\r
-\r
-\r
-\r
-}\r
-\r
-\r
-\r
-\r
git://source.jalview.org / jalview.git / blobdiff