/*
- * Jalview - A Sequence Alignment Editor and Viewer
- * Copyright (C) 2007 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.6)
+ * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
+ *
+ * This file is part of Jalview.
+ *
+ * Jalview is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ *
+ * Jalview is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with Jalview. If not, see <http://www.gnu.org/licenses/>.
*/
-
package jalview.appletgui;
import java.util.*;
import jalview.structure.SequenceListener;
import jalview.structure.StructureSelectionManager;
-public class SeqPanel
- extends Panel implements MouseMotionListener, MouseListener, SequenceListener
+public class SeqPanel extends Panel implements MouseMotionListener,
+ MouseListener, SequenceListener
{
public SeqCanvas seqCanvas;
+
public AlignmentPanel ap;
protected int lastres;
+
protected int startseq;
protected AlignViewport av;
- // if character is inserted or deleted, we will need to recalculate the conservation
+ // if character is inserted or deleted, we will need to recalculate the
+ // conservation
boolean seqEditOccurred = false;
ScrollThread scrollThread = null;
+
boolean mouseDragging = false;
+
boolean editingSeqs = false;
+
boolean groupEditing = false;
int oldSeq = -1;
+
boolean changeEndSeq = false;
+
boolean changeStartSeq = false;
+
boolean changeEndRes = false;
+
boolean changeStartRes = false;
+
SequenceGroup stretchGroup = null;
StringBuffer keyboardNo1;
+
StringBuffer keyboardNo2;
boolean mouseWheelPressed = false;
+
Point lastMousePress;
EditCommand editCommand;
StructureSelectionManager ssm;
-
public SeqPanel(AlignViewport avp, AlignmentPanel p)
{
this.av = avp;
if (editCommand != null && editCommand.getSize() > 0)
{
ap.alignFrame.addHistoryItem(editCommand);
- av.firePropertyChange("alignment", null,
- av.getAlignment().getSequences());
+ av.firePropertyChange("alignment", null, av.getAlignment()
+ .getSequences());
}
startseq = -1;
void setCursorPosition()
{
- SequenceI sequence =
- (Sequence) av.getAlignment().getSequenceAt(seqCanvas.cursorY);
+ SequenceI sequence = (Sequence) av.getAlignment().getSequenceAt(
+ seqCanvas.cursorY);
- seqCanvas.cursorX = sequence.findIndex(
- getKeyboardNo1() - 1
- );
+ seqCanvas.cursorX = sequence.findIndex(getKeyboardNo1() - 1);
scrollToVisible();
}
int maxWidth = av.alignment.getWidth();
while (!av.colSel.isVisible(seqCanvas.cursorX)
- && seqCanvas.cursorX < maxWidth
- && seqCanvas.cursorX > 0)
+ && seqCanvas.cursorX < maxWidth && seqCanvas.cursorX > 0)
{
seqCanvas.cursorX += dx;
}
if (seqCanvas.cursorX >= maxWidth
- || !av.colSel.isVisible(seqCanvas.cursorX))
+ || !av.colSel.isVisible(seqCanvas.cursorX))
{
seqCanvas.cursorX = original;
}
{
ap.scrollUp(false);
}
- while (seqCanvas.cursorX < av.colSel.adjustForHiddenColumns(av.startRes))
+ while (seqCanvas.cursorX < av.colSel
+ .adjustForHiddenColumns(av.startRes))
{
if (!ap.scrollRight(false))
break;
}
}
- while (seqCanvas.cursorX > av.colSel.adjustForHiddenColumns(av.endRes))
+ while (seqCanvas.cursorX > av.colSel
+ .adjustForHiddenColumns(av.endRes))
{
if (!ap.scrollRight(true))
{
}
}
setStatusMessage(av.alignment.getSequenceAt(seqCanvas.cursorY),
- seqCanvas.cursorX, seqCanvas.cursorY);
+ seqCanvas.cursorX, seqCanvas.cursorY);
seqCanvas.repaint();
}
void setSelectionAreaAtCursor(boolean topLeft)
{
- SequenceI sequence =
- (Sequence) av.getAlignment().getSequenceAt(seqCanvas.cursorY);
+ SequenceI sequence = (Sequence) av.getAlignment().getSequenceAt(
+ seqCanvas.cursorY);
if (av.getSelectionGroup() != null)
{
SequenceGroup sg = av.selectionGroup;
- //Find the top and bottom of this group
+ // Find the top and bottom of this group
int min = av.alignment.getHeight(), max = 0;
for (int i = 0; i < sg.getSize(); i++)
{
}
}
-
void setStatusMessage(SequenceI sequence, int res, int seq)
{
- StringBuffer text = new StringBuffer("Sequence " + (seq + 1) + " ID: " +
- sequence.getName());
+ StringBuffer text = new StringBuffer("Sequence " + (seq + 1) + " ID: "
+ + sequence.getName());
Object obj = null;
if (av.alignment.isNucleotide())
{
- obj = ResidueProperties.nucleotideName.get(sequence.getCharAt(res) +
- "");
+ obj = ResidueProperties.nucleotideName.get(sequence.getCharAt(res)
+ + "");
if (obj != null)
{
text.append(" Nucleotide: ");
if (obj != "")
{
- text.append(obj + " (" + sequence.findPosition(res) +
- ")");
+ text.append(obj + " (" + sequence.findPosition(res) + ")");
}
}
{
lastMousePress = evt.getPoint();
- //For now, ignore the mouseWheel font resizing on Macs
- //As the Button2_mask always seems to be true
- if ( (evt.getModifiers() & InputEvent.BUTTON2_MASK) ==
- InputEvent.BUTTON2_MASK && !av.MAC)
+ // For now, ignore the mouseWheel font resizing on Macs
+ // As the Button2_mask always seems to be true
+ if ((evt.getModifiers() & InputEvent.BUTTON2_MASK) == InputEvent.BUTTON2_MASK
+ && !av.MAC)
{
mouseWheelPressed = true;
return;
}
- if (evt.isShiftDown()
- || evt.isControlDown()
- || evt.isAltDown())
+ if (evt.isShiftDown() || evt.isControlDown() || evt.isAltDown())
{
if (evt.isControlDown() || evt.isAltDown())
{
return;
}
- if ( (seq < av.getAlignment().getHeight()) &&
- (res < av.getAlignment().getSequenceAt(seq).getLength()))
+ if ((seq < av.getAlignment().getHeight())
+ && (res < av.getAlignment().getSequenceAt(seq).getLength()))
{
startseq = seq;
lastres = res;
if (evt.getClickCount() > 1)
{
if (av.getSelectionGroup().getSize() == 1
- && av.getSelectionGroup().getEndRes()
- - av.getSelectionGroup().getStartRes() < 2)
+ && av.getSelectionGroup().getEndRes()
+ - av.getSelectionGroup().getStartRes() < 2)
{
av.setSelectionGroup(null);
}
- SequenceFeature[] features = findFeaturesAtRes(
- sequence,
- sequence.findPosition(findRes(evt))
- );
+ SequenceFeature[] features = findFeaturesAtRes(sequence, sequence
+ .findPosition(findRes(evt)));
if (features != null && features.length > 0)
{
SearchResults highlight = new SearchResults();
- highlight.addResult(sequence,
- features[0].getBegin(),
- features[0].getEnd());
+ highlight.addResult(sequence, features[0].getBegin(), features[0]
+ .getEnd());
seqCanvas.highlightSearchResults(highlight);
}
if (features != null && features.length > 0)
{
- seqCanvas.getFeatureRenderer().amendFeatures(
- new SequenceI[]
- {sequence}, features, false, ap);
+ seqCanvas.getFeatureRenderer().amendFeatures(new SequenceI[]
+ { sequence }, features, false, ap);
seqCanvas.highlightSearchResults(null);
}
}
int startWrapBlock = -1;
+
int wrappedBlock = -1;
+
int findRes(MouseEvent evt)
{
int res = 0;
hgap += av.charHeight;
}
- int cHeight = av.getAlignment().getHeight() * av.charHeight
- + hgap + seqCanvas.getAnnotationHeight();
+ int cHeight = av.getAlignment().getHeight() * av.charHeight + hgap
+ + seqCanvas.getAnnotationHeight();
int y = evt.getY();
y -= hgap;
int findSeq(MouseEvent evt)
{
+ final int sqnum = findAlRow(evt);
+ return (sqnum < 0) ? 0 : sqnum;
+ }
+ /**
+ *
+ * @param evt
+ * @return row in alignment that was selected (or -1 for column selection)
+ */
+ private int findAlRow(MouseEvent evt)
+ {
int seq = 0;
int y = evt.getY();
hgap += av.charHeight;
}
- int cHeight = av.getAlignment().getHeight() * av.charHeight
- + hgap + seqCanvas.getAnnotationHeight();
+ int cHeight = av.getAlignment().getHeight() * av.charHeight + hgap
+ + seqCanvas.getAnnotationHeight();
y -= hgap;
- seq = Math.min( (y % cHeight) / av.getCharHeight(),
- av.alignment.getHeight() - 1);
+ seq = Math.min((y % cHeight) / av.getCharHeight(), av.alignment
+ .getHeight() - 1);
if (seq < 0)
{
- seq = 0;
+ seq = -1;
}
}
else
{
- seq = Math.min( (y / av.getCharHeight()) + av.getStartSeq(),
- av.alignment.getHeight() - 1);
+ seq = Math.min((y / av.getCharHeight()) + av.getStartSeq(),
+ av.alignment.getHeight() - 1);
if (seq < 0)
{
- seq = 0;
+ seq = -1;
}
}
return seq;
}
-
-
public void doMousePressed(MouseEvent evt)
{
int seq = findSeq(evt);
int res = findRes(evt);
- if (seq < av.getAlignment().getHeight() &&
- res < av.getAlignment().getSequenceAt(seq).getLength())
+ if (seq < av.getAlignment().getHeight()
+ && res < av.getAlignment().getSequenceAt(seq).getLength())
{
- //char resstr = align.getSequenceAt(seq).getSequence().charAt(res);
+ // char resstr = align.getSequenceAt(seq).getSequence().charAt(res);
// Find the residue's position in the sequence (res is the position
// in the alignment
return;
}
-
String lastMessage;
+
public void mouseOverSequence(SequenceI sequence, int index, int pos)
{
- String tmp = sequence.hashCode()+index+"";
+ String tmp = sequence.hashCode() + index + "";
if (lastMessage == null || !lastMessage.equals(tmp))
ssm.mouseOverSequence(sequence, index, pos);
lastMessage = tmp;
}
-
public void highlightSequence(SearchResults results)
{
seqCanvas.highlightSearchResults(results);
+ if (av.followHighlight)
+ {
+ ap.scrollToPosition(results);
+ }
}
public void updateColours(SequenceI seq, int index)
{
System.out.println("update the seqPanel colours");
- //repaint();
+ // repaint();
}
public void mouseMoved(MouseEvent evt)
if (ssm != null)
mouseOverSequence(sequence, res, respos);
-
- StringBuffer text = new StringBuffer("Sequence " + (seq + 1) + " ID: " +
- sequence.getName());
+ StringBuffer text = new StringBuffer("Sequence " + (seq + 1) + " ID: "
+ + sequence.getName());
Object obj = null;
if (av.alignment.isNucleotide())
{
- obj = ResidueProperties.nucleotideName.get(sequence.getCharAt(res) +
- "");
+ obj = ResidueProperties.nucleotideName.get(sequence.getCharAt(res)
+ + "");
if (obj != null)
{
text.append(" Nucleotide: ");
{
if (groups[g].getStartRes() <= res && groups[g].getEndRes() >= res)
{
- if (!groups[g].getName().startsWith("JTreeGroup") &&
- !groups[g].getName().startsWith("JGroup"))
+ if (!groups[g].getName().startsWith("JTreeGroup")
+ && !groups[g].getName().startsWith("JGroup"))
{
tooltipText.append(groups[g].getName() + " ");
}
}
// use aa to see if the mouse pointer is on a
- SequenceFeature [] allFeatures = findFeaturesAtRes(sequence,
- sequence.findPosition(res));
+ SequenceFeature[] allFeatures = findFeaturesAtRes(sequence, sequence
+ .findPosition(res));
- int index = 0;
- while (index < allFeatures.length)
- {
- SequenceFeature sf = allFeatures[index];
+ int index = 0;
+ while (index < allFeatures.length)
+ {
+ SequenceFeature sf = allFeatures[index];
- tooltipText.append(sf.getType() + " " + sf.begin + ":" + sf.end);
+ tooltipText.append(sf.getType() + " " + sf.begin + ":" + sf.end);
- if (sf.getDescription() != null)
- {
- tooltipText.append(" " + sf.getDescription());
- }
+ if (sf.getDescription() != null)
+ {
+ tooltipText.append(" " + sf.getDescription());
+ }
- if (sf.getValue("status") != null)
+ if (sf.getValue("status") != null)
+ {
+ String status = sf.getValue("status").toString();
+ if (status.length() > 0)
{
- String status = sf.getValue("status").toString();
- if (status.length() > 0)
- {
- tooltipText.append(" (" + sf.getValue("status") + ")");
- }
+ tooltipText.append(" (" + sf.getValue("status") + ")");
}
- tooltipText.append("\n");
-
- index++;
}
+ tooltipText.append("\n");
+
+ index++;
+ }
if (tooltip == null)
{
for (int i = 0; i < features.length; i++)
{
if (av.featuresDisplayed == null
- || !av.featuresDisplayed.containsKey(features[i].getType()))
+ || !av.featuresDisplayed.containsKey(features[i].getType()))
{
continue;
}
-
-
if (features[i].featureGroup != null
- && seqCanvas.fr.featureGroups!=null
- && seqCanvas.fr.featureGroups.containsKey(features[i].featureGroup)
- && !((Boolean)seqCanvas.fr.featureGroups.get(features[i].featureGroup)).booleanValue())
+ && seqCanvas.fr.featureGroups != null
+ && seqCanvas.fr.featureGroups
+ .containsKey(features[i].featureGroup)
+ && !((Boolean) seqCanvas.fr.featureGroups
+ .get(features[i].featureGroup)).booleanValue())
continue;
-
- if ( (features[i].getBegin() <= res) &&
- (features[i].getEnd() >= res))
+ if ((features[i].getBegin() <= res)
+ && (features[i].getEnd() >= res))
{
tmp.addElement(features[i]);
}
return features;
}
-
Tooltip tooltip;
public void mouseDragged(MouseEvent evt)
{
int oldWidth = av.charWidth;
- //Which is bigger, left-right or up-down?
- if (Math.abs(evt.getY() - lastMousePress.y)
- > Math.abs(evt.getX() - lastMousePress.x))
+ // Which is bigger, left-right or up-down?
+ if (Math.abs(evt.getY() - lastMousePress.y) > Math.abs(evt.getX()
+ - lastMousePress.x))
{
int fontSize = av.font.getSize();
fontSize = 1;
}
- av.setFont(new Font(av.font.getName(), av.font.getStyle(), fontSize));
+ av
+ .setFont(new Font(av.font.getName(), av.font.getStyle(),
+ fontSize));
av.charWidth = oldWidth;
}
else
res = 0;
}
- if ( (lastres == -1) || (lastres == res))
+ if ((lastres == -1) || (lastres == res))
{
return;
}
- if ( (res < av.getAlignment().getWidth()) && (res < lastres))
+ if ((res < av.getAlignment().getWidth()) && (res < lastres))
{
// dragLeft, delete gap
editSequence(false, res);
if (!groupEditing && av.hasHiddenRows)
{
if (av.hiddenRepSequences != null
- && av.hiddenRepSequences.containsKey(seq))
+ && av.hiddenRepSequences.containsKey(seq))
{
sg = (SequenceGroup) av.hiddenRepSequences.get(seq);
groupEditing = true;
message.append(Math.abs(startres - lastres) + " gaps.");
ap.alignFrame.statusBar.setText(message.toString());
- //Are we editing within a selection group?
+ // Are we editing within a selection group?
if (groupEditing
- || (sg != null && sg.getSequences(av.hiddenRepSequences).contains(seq)))
+ || (sg != null && sg.getSequences(av.hiddenRepSequences)
+ .contains(seq)))
{
fixedColumns = true;
- //sg might be null as the user may only see 1 sequence,
- //but the sequence represents a group
+ // sg might be null as the user may only see 1 sequence,
+ // but the sequence represents a group
if (sg == null)
{
if (av.hiddenRepSequences == null
- || !av.hiddenRepSequences.containsKey(seq))
+ || !av.hiddenRepSequences.containsKey(seq))
{
endEditing();
return;
fixedLeft = sg.getStartRes();
fixedRight = sg.getEndRes();
- if ( (startres < fixedLeft && lastres >= fixedLeft)
- || (startres >= fixedLeft && lastres < fixedLeft)
- || (startres > fixedRight && lastres <= fixedRight)
- || (startres <= fixedRight && lastres > fixedRight))
+ if ((startres < fixedLeft && lastres >= fixedLeft)
+ || (startres >= fixedLeft && lastres < fixedLeft)
+ || (startres > fixedRight && lastres <= fixedRight)
+ || (startres <= fixedRight && lastres > fixedRight))
{
endEditing();
return;
int y1 = av.getColumnSelection().getHiddenBoundaryLeft(startres);
int y2 = av.getColumnSelection().getHiddenBoundaryRight(startres);
- if ( (insertGap && startres > y1 && lastres < y1)
- || (!insertGap && startres < y2 && lastres > y2))
+ if ((insertGap && startres > y1 && lastres < y1)
+ || (!insertGap && startres < y2 && lastres > y2))
{
endEditing();
return;
}
- //System.out.print(y1+" "+y2+" "+fixedLeft+" "+fixedRight+"~~");
- //Selection spans a hidden region
+ // System.out.print(y1+" "+y2+" "+fixedLeft+" "+fixedRight+"~~");
+ // Selection spans a hidden region
if (fixedLeft < y1 && (fixedRight > y2 || fixedRight == -1))
{
if (startres >= y2)
// drag to right
if (insertGap)
{
- //If the user has selected the whole sequence, and is dragging to
+ // If the user has selected the whole sequence, and is dragging to
// the right, we can still extend the alignment and selectionGroup
- if (sg.getStartRes() == 0
- && sg.getEndRes() == fixedRight
- && sg.getEndRes() == av.alignment.getWidth() - 1
- )
+ if (sg.getStartRes() == 0 && sg.getEndRes() == fixedRight
+ && sg.getEndRes() == av.alignment.getWidth() - 1)
{
sg.setEndRes(av.alignment.getWidth() + startres - lastres);
fixedRight = sg.getEndRes();
// Find the next gap before the end
// of the visible region boundary
boolean blank = false;
- for (fixedRight = fixedRight;
- fixedRight > lastres;
- fixedRight--)
+ for (fixedRight = fixedRight; fixedRight > lastres; fixedRight--)
{
blank = true;
{
for (int j = 0; j < startres - lastres; j++)
{
- if (!jalview.util.Comparison.isGap(
- groupSeqs[g].getCharAt(fixedRight - j)))
+ if (!jalview.util.Comparison.isGap(groupSeqs[g]
+ .getCharAt(fixedRight - j)))
{
blank = false;
break;
{
if (sg.getSize() == av.alignment.getHeight())
{
- if ( (av.hasHiddenColumns
- &&
- startres < av.getColumnSelection().getHiddenBoundaryRight(startres)))
+ if ((av.hasHiddenColumns && startres < av.getColumnSelection()
+ .getHiddenBoundaryRight(startres)))
{
endEditing();
return;
alWidth = hwidth;
}
}
- //We can still insert gaps if the selectionGroup
- //contains all the sequences
+ // We can still insert gaps if the selectionGroup
+ // contains all the sequences
sg.setEndRes(sg.getEndRes() + startres - lastres);
fixedRight = alWidth + startres - lastres;
}
// drag to left
else if (!insertGap)
{
- /// Are we able to delete?
+ // / Are we able to delete?
// ie are all columns blank?
for (g = 0; g < groupSize; g++)
continue;
}
- if (!jalview.util.Comparison.isGap(
- groupSeqs[g].getCharAt(j)))
+ if (!jalview.util.Comparison.isGap(groupSeqs[g].getCharAt(j)))
{
// Not a gap, block edit not valid
endEditing();
}
else
{
- editCommand.appendEdit(EditCommand.INSERT_GAP,
- groupSeqs,
- startres, startres - lastres,
- av.alignment,
- true);
+ editCommand.appendEdit(EditCommand.INSERT_GAP, groupSeqs,
+ startres, startres - lastres, av.alignment, true);
}
}
else
}
else
{
- editCommand.appendEdit(EditCommand.DELETE_GAP,
- groupSeqs,
- startres, lastres - startres,
- av.alignment,
- true);
+ editCommand.appendEdit(EditCommand.DELETE_GAP, groupSeqs,
+ startres, lastres - startres, av.alignment, true);
}
}
}
- else /////Editing a single sequence///////////
+ else
+ // ///Editing a single sequence///////////
{
if (insertGap)
{
for (int j = lastres; j < startres; j++)
{
insertChar(j, new SequenceI[]
- {seq}, fixedRight);
+ { seq }, fixedRight);
}
}
else
{
- editCommand.appendEdit(EditCommand.INSERT_GAP,
- new SequenceI[]
- {seq},
- lastres, startres - lastres,
- av.alignment,
- true);
+ editCommand.appendEdit(EditCommand.INSERT_GAP, new SequenceI[]
+ { seq }, lastres, startres - lastres, av.alignment, true);
}
}
else
break;
}
deleteChar(startres, new SequenceI[]
- {seq}, fixedRight);
+ { seq }, fixedRight);
}
}
else
{
- //could be a keyboard edit trying to delete none gaps
+ // could be a keyboard edit trying to delete none gaps
int max = 0;
for (int m = startres; m < lastres; m++)
{
if (max > 0)
{
- editCommand.appendEdit(EditCommand.DELETE_GAP,
- new SequenceI[]
- {seq},
- startres, max,
- av.alignment,
- true);
+ editCommand.appendEdit(EditCommand.DELETE_GAP, new SequenceI[]
+ { seq }, startres, max, av.alignment, true);
}
}
}
int blankColumn = fixedColumn;
for (int s = 0; s < seq.length; s++)
{
- //Find the next gap before the end of the visible region boundary
- //If lastCol > j, theres a boundary after the gap insertion
+ // Find the next gap before the end of the visible region boundary
+ // If lastCol > j, theres a boundary after the gap insertion
for (blankColumn = fixedColumn; blankColumn > j; blankColumn--)
{
if (jalview.util.Comparison.isGap(seq[s].getCharAt(blankColumn)))
{
- //Theres a space, so break and insert the gap
+ // Theres a space, so break and insert the gap
break;
}
}
}
}
- editCommand.appendEdit(EditCommand.DELETE_GAP,
- seq,
- blankColumn, 1, av.alignment, true);
+ editCommand.appendEdit(EditCommand.DELETE_GAP, seq, blankColumn, 1,
+ av.alignment, true);
- editCommand.appendEdit(EditCommand.INSERT_GAP,
- seq,
- j, 1, av.alignment,
- true);
+ editCommand.appendEdit(EditCommand.INSERT_GAP, seq, j, 1, av.alignment,
+ true);
}
void deleteChar(int j, SequenceI[] seq, int fixedColumn)
{
- editCommand.appendEdit(EditCommand.DELETE_GAP,
- seq,
- j, 1, av.alignment, true);
+ editCommand.appendEdit(EditCommand.DELETE_GAP, seq, j, 1, av.alignment,
+ true);
- editCommand.appendEdit(EditCommand.INSERT_GAP,
- seq,
- fixedColumn, 1, av.alignment, true);
+ editCommand.appendEdit(EditCommand.INSERT_GAP, seq, fixedColumn, 1,
+ av.alignment, true);
}
-//////////////////////////////////////////
-/////Everything below this is for defining the boundary of the rubberband
-//////////////////////////////////////////
+ // ////////////////////////////////////////
+ // ///Everything below this is for defining the boundary of the rubberband
+ // ////////////////////////////////////////
public void doMousePressedDefineMode(MouseEvent evt)
{
if (scrollThread != null)
if (stretchGroup == null)
{
stretchGroup = av.alignment.findGroup(sequence);
- if (stretchGroup != null && res > stretchGroup.getStartRes() &&
- res < stretchGroup.getEndRes())
+ if (stretchGroup != null && res > stretchGroup.getStartRes()
+ && res < stretchGroup.getEndRes())
{
av.setSelectionGroup(stretchGroup);
}
}
else if (!stretchGroup.getSequences(null).contains(sequence)
- || stretchGroup.getStartRes() > res
- || stretchGroup.getEndRes() < res)
+ || stretchGroup.getStartRes() > res
+ || stretchGroup.getEndRes() < res)
{
stretchGroup = null;
{
for (int i = 0; i < allGroups.length; i++)
{
- if (allGroups[i].getStartRes() <= res &&
- allGroups[i].getEndRes() >= res)
+ if (allGroups[i].getStartRes() <= res
+ && allGroups[i].getEndRes() >= res)
{
stretchGroup = allGroups[i];
break;
}
// DETECT RIGHT MOUSE BUTTON IN AWT
- if ( (evt.getModifiers() & InputEvent.BUTTON3_MASK) ==
- InputEvent.BUTTON3_MASK)
+ if ((evt.getModifiers() & InputEvent.BUTTON3_MASK) == InputEvent.BUTTON3_MASK)
{
- SequenceFeature [] allFeatures = findFeaturesAtRes(sequence,
- sequence.findPosition(res));
+ SequenceFeature[] allFeatures = findFeaturesAtRes(sequence, sequence
+ .findPosition(res));
Vector links = null;
if (allFeatures != null)
{
if (allFeatures[i].links != null)
{
- links = new Vector();
+ if (links == null)
+ {
+ links = new Vector();
+ }
for (int j = 0; j < allFeatures[i].links.size(); j++)
{
links.addElement(allFeatures[i].links.elementAt(j));
return;
}
- //Only if left mouse button do we want to change group sizes
+ // Only if left mouse button do we want to change group sizes
if (stretchGroup == null)
{
if (av.getConservationSelected())
{
SliderPanel.setConservationSlider(ap, av.getGlobalColourScheme(),
- "Background");
+ "Background");
}
if (av.getAbovePIDThreshold())
{
SliderPanel.setPIDSliderSource(ap, av.getGlobalColourScheme(),
- "Background");
+ "Background");
}
}
{
if (stretchGroup.cs instanceof ClustalxColourScheme)
{
- ( (ClustalxColourScheme) stretchGroup.cs).resetClustalX(
- stretchGroup.getSequences(av.hiddenRepSequences),
- stretchGroup.getWidth());
+ ((ClustalxColourScheme) stretchGroup.cs).resetClustalX(stretchGroup
+ .getSequences(av.hiddenRepSequences), stretchGroup
+ .getWidth());
}
if (stretchGroup.cs instanceof Blosum62ColourScheme
- || stretchGroup.cs instanceof PIDColourScheme
- || stretchGroup.cs.conservationApplied()
- || stretchGroup.cs.getThreshold() > 0)
+ || stretchGroup.cs instanceof PIDColourScheme
+ || stretchGroup.cs.conservationApplied()
+ || stretchGroup.cs.getThreshold() > 0)
{
stretchGroup.recalcConservation();
}
if (stretchGroup.cs.conservationApplied())
{
- SliderPanel.setConservationSlider(ap, stretchGroup.cs,
- stretchGroup.getName());
+ SliderPanel.setConservationSlider(ap, stretchGroup.cs, stretchGroup
+ .getName());
stretchGroup.recalcConservation();
}
else
{
- SliderPanel.setPIDSliderSource(ap, stretchGroup.cs,
- stretchGroup.getName());
+ SliderPanel.setPIDSliderSource(ap, stretchGroup.cs, stretchGroup
+ .getName());
}
}
changeEndRes = false;
dragDirection = -1;
}
- while ( (y != oldSeq) && (oldSeq > -1) && (y < av.alignment.getHeight()))
+ while ((y != oldSeq) && (oldSeq > -1) && (y < av.alignment.getHeight()))
{
// This routine ensures we don't skip any sequences, as the
// selection is quite slow.
oldSeq = -1;
}
- if (res > av.endRes || res < av.startRes
- || y < av.startSeq || y > av.endSeq)
+ if (res > av.endRes || res < av.startRes || y < av.startSeq
+ || y > av.endSeq)
{
mouseExited(evt);
}
}
// this class allows scrolling off the bottom of the visible alignment
- class ScrollThread
- extends Thread
+ class ScrollThread extends Thread
{
MouseEvent evt;
+
boolean running = false;
+
public ScrollThread()
{
start();
running = ap.scrollUp(true);
}
- if (mouseDragging && evt.getY() >= getSize().height &&
- av.alignment.getHeight() > av.getEndSeq())
+ if (mouseDragging && evt.getY() >= getSize().height
+ && av.alignment.getHeight() > av.getEndSeq())
{
running = ap.scrollUp(false);
}
try
{
Thread.sleep(75);
+ } catch (Exception ex)
+ {
}
- catch (Exception ex)
- {}
}
}
}
git://source.jalview.org / jalview.git / blobdiff