X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FSeqPanel.java;h=893ce2c41f253ec318777ebe2e1dcb629ab3018d;hb=45709c18006e1fba002a9234a5875c986ae98996;hp=27cb9627837d84c23d549743dcc809aa94ece926;hpb=1627d5f04287be852b799ba51bf2b6ded9acecda;p=jalview.git
diff --git a/src/jalview/gui/SeqPanel.java b/src/jalview/gui/SeqPanel.java
index 27cb962..893ce2c 100755
--- a/src/jalview/gui/SeqPanel.java
+++ b/src/jalview/gui/SeqPanel.java
@@ -1,6 +1,6 @@
/*
* Jalview - A Sequence Alignment Editor and Viewer
- * Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
+ * 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
@@ -24,23 +24,31 @@ import java.awt.*;
import java.awt.event.*;
import javax.swing.*;
-import jalview.analysis.*;
+import jalview.commands.*;
import jalview.datamodel.*;
import jalview.schemes.*;
+import jalview.structure.*;
+/**
+ * DOCUMENT ME!
+ *
+ * @author $author$
+ * @version $Revision$
+ */
public class SeqPanel
- extends JPanel
+ extends JPanel implements MouseListener,
+ MouseMotionListener, MouseWheelListener, SequenceListener
+
{
+ /** DOCUMENT ME!! */
public SeqCanvas seqCanvas;
+
+ /** DOCUMENT ME!! */
public AlignmentPanel ap;
protected int lastres;
protected int startseq;
- int startEdit = -1;
- int endEdit = -1;
protected AlignViewport av;
- // if character is inserted or deleted, we will need to recalculate the conservation
- int seqEditOccurred = -1;
ScrollThread scrollThread = null;
boolean mouseDragging = false;
boolean editingSeqs = false;
@@ -57,145 +65,496 @@ public class SeqPanel
SequenceGroup stretchGroup = null;
boolean remove = false;
- public SeqPanel(AlignViewport avp, AlignmentPanel p)
+ Point lastMousePress;
+ boolean mouseWheelPressed = false;
+ StringBuffer keyboardNo1;
+ StringBuffer keyboardNo2;
+
+ java.net.URL linkImageURL;
+
+ StringBuffer tooltipText = new StringBuffer("");
+ String tmpString;
+
+ EditCommand editCommand;
+
+ StructureSelectionManager ssm;
+
+
+ /**
+ * Creates a new SeqPanel object.
+ *
+ * @param avp DOCUMENT ME!
+ * @param p DOCUMENT ME!
+ */
+ public SeqPanel(AlignViewport av, AlignmentPanel ap)
{
+ linkImageURL = getClass().getResource("/images/link.gif");
ToolTipManager.sharedInstance().registerComponent(this);
ToolTipManager.sharedInstance().setInitialDelay(0);
ToolTipManager.sharedInstance().setDismissDelay(10000);
- this.av = avp;
+ this.av = av;
setBackground(Color.white);
- seqCanvas = new SeqCanvas(avp);
+ seqCanvas = new SeqCanvas(ap);
setLayout(new BorderLayout());
add(seqCanvas, BorderLayout.CENTER);
- ap = p;
+ this.ap = ap;
- addMouseMotionListener(new MouseMotionAdapter()
+ if (!av.isDataset())
{
- public void mouseMoved(MouseEvent evt)
+ addMouseMotionListener(this);
+ addMouseListener(this);
+ addMouseWheelListener(this);
+ ssm = StructureSelectionManager.getStructureSelectionManager();
+ ssm.addStructureViewerListener(this);
+ }
+ }
+
+ int startWrapBlock = -1;
+ int wrappedBlock = -1;
+ int findRes(MouseEvent evt)
+ {
+ int res = 0;
+ int x = evt.getX();
+
+ if (av.wrapAlignment)
+ {
+
+ int hgap = av.charHeight;
+ if (av.scaleAboveWrapped)
{
- if (av.getWrapAlignment())
- {
- return;
- }
+ hgap += av.charHeight;
+ }
- doMouseMoved(evt);
+ int cHeight = av.getAlignment().getHeight() * av.charHeight
+ + hgap + seqCanvas.getAnnotationHeight();
+
+ int y = evt.getY();
+ y -= hgap;
+ x -= seqCanvas.LABEL_WEST;
+
+ int cwidth = seqCanvas.getWrappedCanvasWidth(this.getWidth());
+ if (cwidth < 1)
+ {
+ return 0;
}
- public void mouseDragged(MouseEvent evt)
+ wrappedBlock = y / cHeight;
+ wrappedBlock += av.getStartRes() / cwidth;
+
+ res = wrappedBlock * cwidth + x / av.getCharWidth();
+
+ }
+ else
+ {
+ res = (x / av.getCharWidth()) + av.getStartRes();
+ }
+
+ if (av.hasHiddenColumns)
+ {
+ res = av.getColumnSelection().adjustForHiddenColumns(res);
+ }
+
+ return res;
+
+ }
+
+ int findSeq(MouseEvent evt)
+ {
+ int seq = 0;
+ int y = evt.getY();
+
+ if (av.wrapAlignment)
+ {
+ int hgap = av.charHeight;
+ if (av.scaleAboveWrapped)
{
- if (av.getWrapAlignment())
- {
- return;
- }
+ hgap += av.charHeight;
+ }
+
+ int cHeight = av.getAlignment().getHeight() * av.charHeight
+ + hgap + seqCanvas.getAnnotationHeight();
+
+ y -= hgap;
- if (editingSeqs)
+ seq = Math.min( (y % cHeight) / av.getCharHeight(),
+ av.alignment.getHeight() - 1);
+ }
+ else
+ {
+ seq = Math.min( (y / av.getCharHeight()) + av.getStartSeq(),
+ av.alignment.getHeight() - 1);
+ }
+
+ return seq;
+ }
+
+ SequenceFeature[] findFeaturesAtRes(SequenceI sequence, int res)
+ {
+ Vector tmp = new Vector();
+ SequenceFeature[] features = sequence.getSequenceFeatures();
+ if (features != null)
+ {
+ for (int i = 0; i < features.length; i++)
+ {
+ if (av.featuresDisplayed == null
+ || !av.featuresDisplayed.containsKey(features[i].getType()))
{
- doMouseDragged(evt);
+ continue;
}
- else
+
+ 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())
+ continue;
+
+
+ if ( (features[i].getBegin() <= res) &&
+ (features[i].getEnd() >= res))
{
- doMouseDraggedDefineMode(evt);
+ tmp.addElement(features[i]);
}
}
- });
+ }
+
+ features = new SequenceFeature[tmp.size()];
+ tmp.copyInto(features);
+
+ return features;
+ }
+
+
+ void endEditing()
+ {
+ if (editCommand != null && editCommand.getSize() > 0)
+ {
+ ap.alignFrame.addHistoryItem(editCommand);
+ av.firePropertyChange("alignment", null,
+ av.getAlignment().getSequences());
+ }
+
+ startseq = -1;
+ lastres = -1;
+ editingSeqs = false;
+ groupEditing = false;
+ keyboardNo1 = null;
+ keyboardNo2 = null;
+ editCommand = null;
+ }
+
+ void setCursorRow()
+ {
+ seqCanvas.cursorY = getKeyboardNo1() - 1;
+ scrollToVisible();
+ }
+
+ void setCursorColumn()
+ {
+ seqCanvas.cursorX = getKeyboardNo1() - 1;
+ scrollToVisible();
+ }
+
+ void setCursorRowAndColumn()
+ {
+ if (keyboardNo2 == null)
+ {
+ keyboardNo2 = new StringBuffer();
+ }
+ else
+ {
+ seqCanvas.cursorX = getKeyboardNo1() - 1;
+ seqCanvas.cursorY = getKeyboardNo2() - 1;
+ scrollToVisible();
+ }
+ }
- addMouseListener(new MouseAdapter()
+ void setCursorPosition()
+ {
+ SequenceI sequence =
+ (Sequence) av.getAlignment().getSequenceAt(seqCanvas.cursorY);
+
+ seqCanvas.cursorX = sequence.findIndex(
+ getKeyboardNo1() - 1
+ );
+ scrollToVisible();
+ }
+
+ void moveCursor(int dx, int dy)
+ {
+ seqCanvas.cursorX += dx;
+ seqCanvas.cursorY += dy;
+ if (av.hasHiddenColumns && !av.colSel.isVisible(seqCanvas.cursorX))
{
- public void mouseReleased(MouseEvent evt)
+ int original = seqCanvas.cursorX - dx;
+ int maxWidth = av.alignment.getWidth();
+
+ while (!av.colSel.isVisible(seqCanvas.cursorX)
+ && seqCanvas.cursorX < maxWidth
+ && seqCanvas.cursorX > 0)
{
- if (av.getWrapAlignment())
- {
- return;
- }
+ seqCanvas.cursorX += dx;
+ }
- if (editingSeqs)
- {
- doMouseReleased(evt);
- }
- else
- {
- doMouseReleasedDefineMode(evt);
- }
+ if (seqCanvas.cursorX >= maxWidth
+ || !av.colSel.isVisible(seqCanvas.cursorX))
+ {
+ seqCanvas.cursorX = original;
}
+ }
+
+ scrollToVisible();
+ }
+
+ void scrollToVisible()
+ {
+ if (seqCanvas.cursorX < 0)
+ {
+ seqCanvas.cursorX = 0;
+ }
+ else if (seqCanvas.cursorX > av.alignment.getWidth() - 1)
+ {
+ seqCanvas.cursorX = av.alignment.getWidth() - 1;
+ }
- public void mousePressed(MouseEvent evt)
+ if (seqCanvas.cursorY < 0)
+ {
+ seqCanvas.cursorY = 0;
+ }
+ else if (seqCanvas.cursorY > av.alignment.getHeight() - 1)
+ {
+ seqCanvas.cursorY = av.alignment.getHeight() - 1;
+ }
+
+ endEditing();
+ if (av.wrapAlignment)
+ {
+ ap.scrollToWrappedVisible(seqCanvas.cursorX);
+ }
+ else
+ {
+ while (seqCanvas.cursorY < av.startSeq)
{
- if (av.getWrapAlignment())
+ ap.scrollUp(true);
+ }
+ while (seqCanvas.cursorY + 1 > av.endSeq)
+ {
+ ap.scrollUp(false);
+ }
+ if (!av.wrapAlignment)
+ {
+ while (seqCanvas.cursorX < av.colSel.adjustForHiddenColumns(av.startRes))
{
- return;
+ if (!ap.scrollRight(false))
+ {
+ break;
+ }
}
-
- if (evt.isShiftDown() || evt.isAltDown() ||
- evt.isControlDown())
+ while (seqCanvas.cursorX > av.colSel.adjustForHiddenColumns(av.endRes))
{
- if (evt.isAltDown() || evt.isControlDown())
+ if (!ap.scrollRight(true))
{
- groupEditing = true;
+ break;
}
+ }
+ }
+ }
+ setStatusMessage(av.alignment.getSequenceAt(seqCanvas.cursorY),
+ seqCanvas.cursorX, seqCanvas.cursorY);
- editingSeqs = true;
- doMousePressed(evt);
+ seqCanvas.repaint();
+ }
+
+ void setSelectionAreaAtCursor(boolean topLeft)
+ {
+ SequenceI sequence =
+ (Sequence) av.getAlignment().getSequenceAt(seqCanvas.cursorY);
+
+ if (av.getSelectionGroup() != null)
+ {
+ SequenceGroup sg = av.selectionGroup;
+ //Find the top and bottom of this group
+ int min = av.alignment.getHeight(), max = 0;
+ for (int i = 0; i < sg.getSize(); i++)
+ {
+ int index = av.alignment.findIndex(sg.getSequenceAt(i));
+ if (index > max)
+ {
+ max = index;
}
- else
+ if (index < min)
{
- doMousePressedDefineMode(evt);
+ min = index;
}
}
- public void mouseExited(MouseEvent evt)
+ max++;
+
+ if (topLeft)
{
- if (av.getWrapAlignment() || editingSeqs)
+ sg.setStartRes(seqCanvas.cursorX);
+ if (sg.getEndRes() < seqCanvas.cursorX)
{
- return;
+ sg.setEndRes(seqCanvas.cursorX);
}
- doMouseExitedDefineMode(evt);
+ min = seqCanvas.cursorY;
}
-
- public void mouseEntered(MouseEvent evt)
+ else
{
- if (av.getWrapAlignment() || editingSeqs)
+ sg.setEndRes(seqCanvas.cursorX);
+ if (sg.getStartRes() > seqCanvas.cursorX)
{
- return;
+ sg.setStartRes(seqCanvas.cursorX);
}
- doMouseEnteredDefineMode(evt);
+ max = seqCanvas.cursorY + 1;
+ }
+
+ if (min > max)
+ {
+ // Only the user can do this
+ av.setSelectionGroup(null);
}
- });
+ else
+ {
+ // Now add any sequences between min and max
+ sg.getSequences(null).clear();
+ for (int i = min; i < max; i++)
+ {
+ sg.addSequence(av.alignment.getSequenceAt(i), false);
+ }
+ }
+ }
+
+ if (av.getSelectionGroup() == null)
+ {
+ SequenceGroup sg = new SequenceGroup();
+ sg.setStartRes(seqCanvas.cursorX);
+ sg.setEndRes(seqCanvas.cursorX);
+ sg.addSequence(sequence, false);
+ av.setSelectionGroup(sg);
+ }
+
+ ap.paintAlignment(false);
}
+ void insertGapAtCursor(boolean group)
+ {
+ groupEditing = group;
+ startseq = seqCanvas.cursorY;
+ lastres = seqCanvas.cursorX;
+ editSequence(true, seqCanvas.cursorX + getKeyboardNo1());
+ endEditing();
+ }
- public void doMouseReleased(MouseEvent evt)
+ void deleteGapAtCursor(boolean group)
{
- if (seqEditOccurred > -1)
+ groupEditing = group;
+ startseq = seqCanvas.cursorY;
+ lastres = seqCanvas.cursorX + getKeyboardNo1();
+ editSequence(false, seqCanvas.cursorX);
+ endEditing();
+ }
+
+ void numberPressed(char value)
+ {
+ if (keyboardNo1 == null)
{
- editOccurred(seqEditOccurred);
+ keyboardNo1 = new StringBuffer();
}
- startseq = -1;
- lastres = -1;
- seqEditOccurred = -1;
- editingSeqs = false;
- groupEditing = false;
+ if (keyboardNo2 != null)
+ {
+ keyboardNo2.append(value);
+ }
+ else
+ {
+ keyboardNo1.append(value);
+ }
+ }
- seqCanvas.repaint();
+ int getKeyboardNo1()
+ {
+ if (keyboardNo1 == null)
+ return 1;
+ else
+ {
+ int value = Integer.parseInt(keyboardNo1.toString());
+ keyboardNo1 = null;
+ return value;
+ }
+ }
+
+ int getKeyboardNo2()
+ {
+ if (keyboardNo2 == null)
+ return 1;
+ else
+ {
+ int value = Integer.parseInt(keyboardNo2.toString());
+ keyboardNo2 = null;
+ return value;
+ }
}
- public void doMousePressed(MouseEvent evt)
+ /**
+ * DOCUMENT ME!
+ *
+ * @param evt DOCUMENT ME!
+ */
+ public void mouseReleased(MouseEvent evt)
{
- ap.alignFrame.addHistoryItem(new HistoryItem("Edit Sequence",
- av.alignment, HistoryItem.EDIT));
+ mouseDragging = false;
+ mouseWheelPressed = false;
- int seq;
- int res;
+ if (!editingSeqs)
+ {
+ doMouseReleasedDefineMode(evt);
+ return;
+ }
- int x = evt.getX();
- int y = evt.getY();
+ endEditing();
+ }
- res = (x / av.getCharWidth()) + av.getStartRes();
- seq = (y / av.getCharHeight()) + av.getStartSeq();
+ /**
+ * DOCUMENT ME!
+ *
+ * @param evt DOCUMENT ME!
+ */
+ public void mousePressed(MouseEvent evt)
+ {
+ lastMousePress = evt.getPoint();
+
+ if (javax.swing.SwingUtilities.isMiddleMouseButton(evt))
+ {
+ mouseWheelPressed = true;
+ return;
+ }
+
+ if (evt.isShiftDown() || evt.isAltDown() ||
+ evt.isControlDown())
+ {
+ if (evt.isAltDown() || evt.isControlDown())
+ {
+ groupEditing = true;
+ }
+ editingSeqs = true;
+ }
+ else
+ {
+ doMousePressedDefineMode(evt);
+ return;
+ }
+
+ int seq = findSeq(evt);
+ int res = findRes(evt);
+
+ if (seq < 0 || res < 0)
+ {
+ return;
+ }
if ( (seq < av.getAlignment().getHeight()) &&
(res < av.getAlignment().getSequenceAt(seq).getLength()))
@@ -209,38 +568,54 @@ public class SeqPanel
lastres = -1;
}
- startEdit = lastres;
- endEdit = lastres;
-
return;
}
- public void doMouseMoved(MouseEvent evt)
+ String lastMessage;
+ public void mouseOverSequence(SequenceI sequence, int index)
{
- int res = 0;
- int seq = 0;
- int x = evt.getX();
- int y = evt.getY();
-
- if (av.wrapAlignment)
- {
- y -= (2 * av.charHeight);
+ String tmp = sequence.hashCode()+index+"";
+ if (lastMessage == null || !lastMessage.equals(tmp))
+ ssm.mouseOverSequence(sequence, index);
- int chunkHeight = (av.getAlignment().getHeight() + 2) * av.charHeight;
+ lastMessage = tmp;
+ }
- res = (int) ( (y / chunkHeight) * (getWidth() / av.charWidth)) +
- (x / av.getCharWidth()) + av.getStartRes();
- y %= chunkHeight;
- seq = (y / av.getCharHeight()) + av.getStartSeq();
+ public void highlightSequence(jalview.datamodel.SequenceI seq, int index)
+ {
+ if(av.alignment.findIndex(seq)>-1)
+ {
+ SearchResults highlight = new SearchResults();
+ highlight.addResult(seq,index,index);
+ seqCanvas.highlightSearchResults(highlight);
}
- else
+ }
+
+ public void updateColours(SequenceI seq, int index)
+ {
+ System.out.println("update the seqPanel colours");
+ //repaint();
+ }
+
+ /**
+ * DOCUMENT ME!
+ *
+ * @param evt DOCUMENT ME!
+ */
+ public void mouseMoved(MouseEvent evt)
+ {
+ if (editingSeqs)
{
- res = (x / av.getCharWidth()) + av.getStartRes();
- seq = (y / av.getCharHeight()) + av.getStartSeq();
+ // This is because MacOSX creates a mouseMoved
+ // If control is down, other platforms will not.
+ mouseDragged(evt);
}
- if (seq >= av.getAlignment().getHeight())
+ int res = findRes(evt);
+ int seq = findSeq(evt);
+
+ if (res < 0 || seq < 0 || seq >= av.getAlignment().getHeight())
{
return;
}
@@ -252,274 +627,798 @@ public class SeqPanel
return;
}
- Object obj = ResidueProperties.aa2Triplet.get(sequence.getCharAt(res) +
- "");
- String aa = "";
+ if (ssm != null)
+ mouseOverSequence(sequence, sequence.findPosition(res));
- if (obj != null)
+ setStatusMessage(sequence, res, seq);
+
+ tooltipText.setLength(6); // Cuts the buffer back to
+
+ SequenceGroup[] groups = av.alignment.findAllGroups(sequence);
+ if (groups != null)
+ {
+ for (int g = 0; g < groups.length; g++)
+ {
+ if (groups[g].getStartRes() <= res && groups[g].getEndRes() >= res)
+ {
+ if (tooltipText.length() > 6)
+ {
+ tooltipText.append("
");
+ }
+
+ if (!groups[g].getName().startsWith("JTreeGroup") &&
+ !groups[g].getName().startsWith("JGroup"))
+ {
+ tooltipText.append(groups[g].getName());
+ }
+
+ if (groups[g].getDescription() != null)
+ {
+ tooltipText.append(": " + groups[g].getDescription());
+ }
+ }
+ }
+ }
+
+ // use aa to see if the mouse pointer is on a
+ if (av.showSequenceFeatures)
+ {
+ SequenceFeature[] features = findFeaturesAtRes(
+ sequence.getDatasetSequence(), sequence.findPosition(res));
+
+ if (features != null)
+ {
+ for (int i = 0; i < features.length; i++)
+ {
+ if (features[i].getType().equals("disulfide bond"))
+ {
+ if (features[i].getBegin() == sequence.findPosition(res)
+ || features[i].getEnd() == sequence.findPosition(res))
+ {
+ if (tooltipText.length() > 6)
+ {
+ tooltipText.append("
");
+ }
+ tooltipText.append("disulfide bond " + features[i].getBegin() +
+ ":" +
+ features[i].getEnd());
+ if (features[i].links != null)
+ {
+ tooltipText.append(" ![](\"")
");
+ }
+ }
+ }
+ else
+ {
+ if (tooltipText.length() > 6)
+ {
+ tooltipText.append("
");
+ }
+
+ tooltipText.append(features[i].getType() + " " +
+ features[i].begin);
+ if (features[i].begin != features[i].end)
+ {
+ tooltipText.append(" " + features[i].end);
+ }
+
+ if (features[i].getDescription() != null
+ && !features[i].description.equals(features[i].getType()))
+ {
+ tmpString = features[i].getDescription();
+ int startTag = tmpString.toUpperCase().indexOf("");
+ if (startTag > -1)
+ {
+ tmpString = tmpString.substring(startTag + 6);
+ }
+ int endTag = tmpString.toUpperCase().indexOf("");
+ if (endTag > -1)
+ {
+ tmpString = tmpString.substring(0, endTag);
+ }
+ endTag = tmpString.toUpperCase().indexOf("");
+ if (endTag > -1)
+ {
+ tmpString = tmpString.substring(0, endTag);
+ }
+
+ if (startTag > -1)
+ {
+ tooltipText.append("; " + tmpString);
+ }
+ else
+ {
+ if (tmpString.indexOf("<") > -1 || tmpString.indexOf(">") > -1)
+ {
+ //The description does not specify html is to
+ //be used, so we must remove < > symbols
+ tmpString = tmpString.replaceAll("<", "<");
+ tmpString = tmpString.replaceAll(">", ">");
+
+ tooltipText.append("; ");
+ tooltipText.append(tmpString);
+
+ }
+ else
+ {
+ tooltipText.append("; " + tmpString);
+ }
+ }
+ }
+ if (features[i].getValue("status") != null)
+ {
+ String status = features[i].getValue("status").toString();
+ if (status.length() > 0)
+ {
+ tooltipText.append("; (" + features[i].getValue("status") + ")");
+ }
+ }
+
+ if (features[i].links != null)
+ {
+ tooltipText.append(" ");
+ }
+
+ }
+ }
+ }
+ }
+
+ if (tooltipText.length() == 6) //
+ {
+ setToolTipText(null);
+ }
+ else
{
- aa = obj.toString();
+ tooltipText.append("");
+ if (lastTooltip == null || !lastTooltip.equals(tooltipText.toString()))
+ setToolTipText(tooltipText.toString());
+
+ lastTooltip = tooltipText.toString();
}
+ }
+ String lastTooltip;
+
+ void setStatusMessage(SequenceI sequence, int res, int seq)
+ {
StringBuffer text = new StringBuffer("Sequence " + (seq + 1) + " ID: " +
sequence.getName());
- if (aa != "")
+ Object obj = null;
+ if (av.alignment.isNucleotide())
{
- text.append(" Residue: " + aa + " (" +
- av.getAlignment().getSequenceAt(seq).findPosition(res) + ")");
+ obj = ResidueProperties.nucleotideName.get(sequence.getCharAt(res) +
+ "");
+ if (obj != null)
+ {
+ text.append(" Nucleotide: ");
+ }
}
+ else
+ {
+ obj = ResidueProperties.aa2Triplet.get(sequence.getCharAt(res) + "");
+ if (obj != null)
+ {
+ text.append(" Residue: ");
+ }
+ }
+
+ if (obj != null)
+ {
+ if (obj != "")
+ {
+ text.append(obj + " (" + sequence.findPosition(res) +
+ ")");
+ }
+ }
ap.alignFrame.statusBar.setText(text.toString());
- // use aa to see if the mouse pointer is on a
- if (av.showSequenceFeatures)
+ }
+
+ /**
+ * DOCUMENT ME!
+ *
+ * @param evt DOCUMENT ME!
+ */
+ public void mouseDragged(MouseEvent evt)
+ {
+ if (mouseWheelPressed)
{
- Vector features = sequence.getSequenceFeatures();
- Enumeration e = features.elements();
- StringBuffer sbuffer = new StringBuffer();
+ int oldWidth = av.charWidth;
- while (e.hasMoreElements())
+ //Which is bigger, left-right or up-down?
+ if (Math.abs(evt.getY() - lastMousePress.getY())
+ > Math.abs(evt.getX() - lastMousePress.getX()))
{
- SequenceFeature sf = (SequenceFeature) e.nextElement();
+ int fontSize = av.font.getSize();
- if ( (sf.getStart() <= sequence.findPosition(res)) &&
- (sf.getEnd() >= sequence.findPosition(res)))
+ if (evt.getY() < lastMousePress.getY())
{
- if (sbuffer.length() > 0)
- {
- sbuffer.append("; ");
- }
+ fontSize--;
+ }
+ else if (evt.getY() > lastMousePress.getY())
+ {
+ fontSize++;
+ }
+
+ if (fontSize < 1)
+ {
+ fontSize = 1;
+ }
+
+ av.setFont(new Font(av.font.getName(), av.font.getStyle(), fontSize));
+ av.charWidth = oldWidth;
+ ap.fontChanged();
+ }
+ else
+ {
+ if (evt.getX() < lastMousePress.getX() && av.charWidth > 1)
+ {
+ av.charWidth--;
+ }
+ else if (evt.getX() > lastMousePress.getX())
+ {
+ av.charWidth++;
+ }
+
+ ap.paintAlignment(false);
+ }
+
+ FontMetrics fm = getFontMetrics(av.getFont());
+ av.validCharWidth = fm.charWidth('M') <= av.charWidth;
+
+ lastMousePress = evt.getPoint();
+
+ return;
+ }
+
+ if (!editingSeqs)
+ {
+ doMouseDraggedDefineMode(evt);
+ return;
+ }
+
+ int res = findRes(evt);
+
+ if (res < 0)
+ {
+ res = 0;
+ }
+
+ if ( (lastres == -1) || (lastres == res))
+ {
+ return;
+ }
+
+ if ( (res < av.getAlignment().getWidth()) && (res < lastres))
+ {
+ // dragLeft, delete gap
+ editSequence(false, res);
+ }
+ else
+ {
+ editSequence(true, res);
+ }
+
+ mouseDragging = true;
+ if (scrollThread != null)
+ {
+ scrollThread.setEvent(evt);
+ }
+ }
+
+
+
+ synchronized void editSequence(boolean insertGap, int startres)
+ {
+ int fixedLeft = -1;
+ int fixedRight = -1;
+ boolean fixedColumns = false;
+ SequenceGroup sg = av.getSelectionGroup();
+
+ SequenceI seq = av.alignment.getSequenceAt(startseq);
+
+ //No group, but the sequence may represent a group
+ if (!groupEditing && av.hasHiddenRows)
+ {
+ if (av.hiddenRepSequences != null
+ && av.hiddenRepSequences.containsKey(seq))
+ {
+ sg = (SequenceGroup) av.hiddenRepSequences.get(seq);
+ groupEditing = true;
+ }
+ }
+
+ StringBuffer message = new StringBuffer();
+ if (groupEditing)
+ {
+ message.append("Edit group:");
+ if (editCommand == null)
+ {
+ editCommand = new EditCommand("Edit Group");
+ }
+ }
+ else
+ {
+ message.append("Edit sequence: " + seq.getName());
+ String label = seq.getName();
+ if (label.length() > 10)
+ {
+ label = label.substring(0, 10);
+ }
+ if (editCommand == null)
+ {
+ editCommand = new EditCommand("Edit " + label);
+ }
+ }
+
+ if (insertGap)
+ {
+ message.append(" insert ");
+ }
+ else
+ {
+ message.append(" delete ");
+ }
+
+ message.append(Math.abs(startres - lastres) + " gaps.");
+ ap.alignFrame.statusBar.setText(message.toString());
- sbuffer.append(sf.getType() + " " + sf.getDescription());
+ //Are we editing within a selection group?
+ if (groupEditing
+ || (sg != null && sg.getSequences(av.hiddenRepSequences).contains(seq)))
+ {
+ fixedColumns = true;
- if (sf.getStatus().length() > 0)
- {
- sbuffer.append(" (" + sf.getStatus() + ")");
- }
+ //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))
+ {
+ endEditing();
+ return;
}
+ sg = (SequenceGroup) av.hiddenRepSequences.get(seq);
}
- this.setToolTipText(sbuffer.toString());
- }
- }
+ fixedLeft = sg.getStartRes();
+ fixedRight = sg.getEndRes();
- public void doMouseDragged(MouseEvent evt)
- {
- // If we're dragging we're editing
- int res = (evt.getX() / av.getCharWidth()) + av.getStartRes();
+ if ( (startres < fixedLeft && lastres >= fixedLeft)
+ || (startres >= fixedLeft && lastres < fixedLeft)
+ || (startres > fixedRight && lastres <= fixedRight)
+ || (startres <= fixedRight && lastres > fixedRight))
+ {
+ endEditing();
+ return;
+ }
- if (res < 0)
- {
- res = 0;
+ if (fixedLeft > startres)
+ {
+ fixedRight = fixedLeft - 1;
+ fixedLeft = 0;
+ }
+ else if (fixedRight < startres)
+ {
+ fixedLeft = fixedRight;
+ fixedRight = -1;
+ }
}
- if ( (lastres == -1) || (lastres == res))
+ if (av.hasHiddenColumns)
{
- return;
- }
+ fixedColumns = true;
+ int y1 = av.getColumnSelection().getHiddenBoundaryLeft(startres);
+ int y2 = av.getColumnSelection().getHiddenBoundaryRight(startres);
- boolean dragRight = true;
+ if ( (insertGap && startres > y1 && lastres < y1)
+ || (!insertGap && startres < y2 && lastres > y2))
+ {
+ endEditing();
+ return;
+ }
- if ( (res < av.getAlignment().getWidth()) && (res < lastres))
- {
- dragRight = false;
+ //System.out.print(y1+" "+y2+" "+fixedLeft+" "+fixedRight+"~~");
+ //Selection spans a hidden region
+ if (fixedLeft < y1 && (fixedRight > y2 || fixedRight == -1))
+ {
+ if (startres >= y2)
+ {
+ fixedLeft = y2;
+ }
+ else
+ {
+ fixedRight = y2 - 1;
+ }
+ }
}
- if (res != lastres)
+ if (groupEditing)
{
- // Group editing
- if (groupEditing)
+ Vector vseqs = sg.getSequences(av.hiddenRepSequences);
+ int g, groupSize = vseqs.size();
+ SequenceI[] groupSeqs = new SequenceI[groupSize];
+ for (g = 0; g < groupSeqs.length; g++)
{
- SequenceGroup sg = av.getSelectionGroup();
+ groupSeqs[g] = (SequenceI) vseqs.elementAt(g);
+ }
- if (sg == null)
+ // drag to right
+ if (insertGap)
+ {
+ //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
+ )
{
- lastres = -1;
-
- return;
+ sg.setEndRes(av.alignment.getWidth() + startres - lastres);
+ fixedRight = sg.getEndRes();
}
- // drag to right
- if (dragRight)
+ // Is it valid with fixed columns??
+ // Find the next gap before the end
+ // of the visible region boundary
+ boolean blank = false;
+ for (fixedRight = fixedRight;
+ fixedRight > lastres;
+ fixedRight--)
{
- sg.setEndRes(sg.getEndRes() + (res - lastres));
- }
- // drag to left
- else
- {
- /// Are we able to delete?
- // ie are all columns blank?
- boolean deleteAllowed = false;
+ blank = true;
- for (int s = 0; s < sg.getSize(); s++)
+ for (g = 0; g < groupSize; g++)
{
- SequenceI seq = sg.getSequenceAt(s);
-
- for (int j = res; j < lastres; j++)
+ for (int j = 0; j < startres - lastres; j++)
{
- if (seq.getSequence().length() <= j)
- {
- continue;
- }
-
if (!jalview.util.Comparison.isGap(
- seq.getSequence().charAt(j)))
+ groupSeqs[g].getCharAt(fixedRight - j)))
{
- // Not a gap, block edit not valid
- res = j + 1;
- deleteAllowed = false;
-
- continue;
+ blank = false;
+ break;
}
-
- deleteAllowed = true;
}
}
-
- if (!deleteAllowed)
+ if (blank)
{
- lastres = -1;
-
- return;
+ break;
}
-
- sg.setEndRes(sg.getEndRes() - (lastres - res));
}
- for (int i = 0; i < sg.getSize(); i++)
+ if (!blank)
{
- SequenceI s = sg.getSequenceAt(i);
- int k = av.alignment.findIndex(s);
-
- // drag to right
- if (dragRight)
+ if (sg.getSize() == av.alignment.getHeight())
{
- for (int j = lastres; j < res; j++)
+ if ( (av.hasHiddenColumns
+ &&
+ startres < av.getColumnSelection().getHiddenBoundaryRight(startres)))
+ {
+ endEditing();
+ return;
+ }
+
+ int alWidth = av.alignment.getWidth();
+ if (av.hasHiddenRows)
{
- insertChar(j, k);
+ int hwidth = av.alignment.getHiddenSequences().getWidth();
+ if (hwidth > alWidth)
+ {
+ alWidth = hwidth;
+ }
}
+ //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
{
- for (int j = res; j < lastres; j++)
+ endEditing();
+ return;
+ }
+ }
+ }
+
+ // drag to left
+ else if (!insertGap)
+ {
+ /// Are we able to delete?
+ // ie are all columns blank?
+
+ for (g = 0; g < groupSize; g++)
+ {
+ for (int j = startres; j < lastres; j++)
+ {
+ if (groupSeqs[g].getLength() <= j)
{
- if (s.getLength() > j)
- {
- deleteChar(res, k);
- }
+ continue;
+ }
+
+ if (!jalview.util.Comparison.isGap(
+ groupSeqs[g].getCharAt(j)))
+ {
+ // Not a gap, block edit not valid
+ endEditing();
+ return;
}
}
}
}
- else /////Editing a single sequence///////////
+
+ if (insertGap)
+ {
+ // dragging to the right
+ if (fixedColumns && fixedRight != -1)
+ {
+ for (int j = lastres; j < startres; j++)
+ {
+ insertChar(j, groupSeqs, fixedRight);
+ }
+ }
+ else
+ {
+ editCommand.appendEdit(EditCommand.INSERT_GAP,
+ groupSeqs,
+ startres, startres - lastres,
+ av.alignment,
+ true);
+ }
+ }
+ else
+ {
+ // dragging to the left
+ if (fixedColumns && fixedRight != -1)
+ {
+ for (int j = lastres; j > startres; j--)
+ {
+ deleteChar(startres, groupSeqs, fixedRight);
+ }
+ }
+ else
+ {
+ editCommand.appendEdit(EditCommand.DELETE_GAP,
+ groupSeqs,
+ startres, lastres - startres,
+ av.alignment,
+ true);
+ }
+
+ }
+ }
+ else /////Editing a single sequence///////////
+ {
+ if (insertGap)
{
- if ( (res < av.getAlignment().getWidth()) && (res > lastres))
+ // dragging to the right
+ if (fixedColumns && fixedRight != -1)
{
- // dragging to the right
- for (int j = lastres; j < res; j++)
+ for (int j = lastres; j < startres; j++)
{
- insertChar(j, startseq);
+ insertChar(j, new SequenceI[]
+ {seq}, fixedRight);
}
}
- else if ( (res < av.getAlignment().getWidth()) &&
- (res < lastres))
+ else
+ {
+ editCommand.appendEdit(EditCommand.INSERT_GAP,
+ new SequenceI[]
+ {seq},
+ lastres, startres - lastres,
+ av.alignment,
+ true);
+ }
+ }
+ else
+ {
+ // dragging to the left
+ if (fixedColumns && fixedRight != -1)
{
- // dragging to the left
- for (int j = lastres; j > res; j--)
+ for (int j = lastres; j > startres; j--)
{
- if (jalview.util.Comparison.isGap(
- av.alignment.getSequenceAt(startseq)
- .getSequence().charAt(res)))
+ if (!jalview.util.Comparison.isGap(seq.getCharAt(startres)))
{
- deleteChar(res, startseq);
+ endEditing();
+ break;
}
- else
+ deleteChar(startres, new SequenceI[]
+ {seq}, fixedRight);
+ }
+ }
+ else
+ {
+ //could be a keyboard edit trying to delete none gaps
+ int max = 0;
+ for (int m = startres; m < lastres; m++)
+ {
+ if (!jalview.util.Comparison.isGap(seq.getCharAt(m)))
{
break;
}
+ max++;
+ }
+
+ if (max > 0)
+ {
+ editCommand.appendEdit(EditCommand.DELETE_GAP,
+ new SequenceI[]
+ {seq},
+ startres, max,
+ av.alignment,
+ true);
}
}
}
}
- endEdit = res;
- lastres = res;
+ lastres = startres;
seqCanvas.repaint();
}
- public void drawChars(int seqstart, int seqend, int start)
+ void insertChar(int j, SequenceI[] seq, int fixedColumn)
{
- seqCanvas.drawPanel(seqCanvas.gg, start, av.getEndRes(), seqstart,
- seqend, av.getStartRes(), av.getStartSeq(), 0);
- seqCanvas.repaint();
+ 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
+
+ for (blankColumn = fixedColumn; blankColumn > j; blankColumn--)
+ {
+ if (jalview.util.Comparison.isGap(seq[s].getCharAt(blankColumn)))
+ {
+ //Theres a space, so break and insert the gap
+ break;
+ }
+ }
+
+ if (blankColumn <= j)
+ {
+ blankColumn = fixedColumn;
+ endEditing();
+ return;
+ }
+ }
+
+ editCommand.appendEdit(EditCommand.DELETE_GAP,
+ seq,
+ blankColumn, 1, av.alignment, true);
+
+ editCommand.appendEdit(EditCommand.INSERT_GAP,
+ seq,
+ j, 1, av.alignment,
+ true);
+
}
- public void insertChar(int j, int seq)
+ void deleteChar(int j, SequenceI[] seq, int fixedColumn)
{
- av.alignment.getSequenceAt(seq).insertCharAt(j, av.getGapCharacter());
- seqEditOccurred = seq;
+
+ editCommand.appendEdit(EditCommand.DELETE_GAP,
+ seq,
+ j, 1, av.alignment, true);
+
+ editCommand.appendEdit(EditCommand.INSERT_GAP,
+ seq,
+ fixedColumn, 1, av.alignment, true);
}
- public void deleteChar(int j, int seq)
+ /**
+ * DOCUMENT ME!
+ *
+ * @param e DOCUMENT ME!
+ */
+ public void mouseEntered(MouseEvent e)
{
- av.alignment.getSequenceAt(seq).deleteCharAt(j);
- seqEditOccurred = seq;
+ if (oldSeq < 0)
+ {
+ oldSeq = 0;
+ }
- av.alignment.getWidth();
- seqCanvas.repaint();
+ if (scrollThread != null)
+ {
+ scrollThread.running = false;
+ scrollThread = null;
+ }
}
- void editOccurred(int i)
+ /**
+ * DOCUMENT ME!
+ *
+ * @param e DOCUMENT ME!
+ */
+ public void mouseExited(MouseEvent e)
{
- if (endEdit == startEdit)
+ if (av.getWrapAlignment())
{
- ap.alignFrame.historyList.pop();
- ap.alignFrame.updateEditMenuBar();
+ return;
}
- av.updateConservation();
- av.updateConsensus();
-
- // Y O Y CLUSTALX
- ColourSchemeI cs = av.getGlobalColourScheme();
+ if (mouseDragging)
+ {
+ scrollThread = new ScrollThread();
+ }
+ }
- if (cs instanceof ConservationColourScheme)
+ public void mouseClicked(MouseEvent evt)
+ {
+ SequenceI sequence = av.alignment.getSequenceAt(findSeq(evt));
+ if (evt.getClickCount() > 1)
{
- ConservationColourScheme ccs = (ConservationColourScheme) cs;
+ if (av.getSelectionGroup().getSize() == 1
+ && av.getSelectionGroup().getEndRes()
+ - av.getSelectionGroup().getStartRes() < 2)
+ {
+ av.setSelectionGroup(null);
+ }
- if (ccs.cs instanceof ClustalxColourScheme)
+ SequenceFeature[] features = findFeaturesAtRes(
+ sequence.getDatasetSequence(),
+ sequence.findPosition(findRes(evt))
+ );
+
+ if (features != null && features.length > 0)
+ {
+ SearchResults highlight = new SearchResults();
+ highlight.addResult(sequence,
+ features[0].getBegin(),
+ features[0].getEnd());
+ seqCanvas.highlightSearchResults(highlight);
+ }
+ if (features != null && features.length > 0)
{
- Conservation c = new Conservation("All",
- ResidueProperties.propHash, 3,
- av.alignment.getSequences(), 0,
- av.alignment.getWidth() - 1);
- c.calculate();
- c.verdict(false, av.ConsPercGaps);
+ seqCanvas.getFeatureRenderer().amendFeatures(
+ new SequenceI[]
+ {sequence}, features, false, ap);
- ClustalxColourScheme cxs = (ClustalxColourScheme) ccs.cs;
- cxs.resetClustalX(av.alignment.getSequences(),
- av.alignment.getWidth());
- ccs = new ConservationColourScheme(c, cxs);
- av.setGlobalColourScheme(ccs);
+ seqCanvas.highlightSearchResults(null);
}
}
+ }
- if (cs instanceof ClustalxColourScheme)
- {
- ( (ClustalxColourScheme) cs).resetClustalX(av.alignment.getSequences(),
- av.alignment.getWidth());
- av.setGlobalColourScheme(cs);
- }
+ public void mouseWheelMoved(MouseWheelEvent e)
+ {
+ e.consume();
+ if (e.getWheelRotation() > 0)
+ {
+ ap.scrollUp(false);
+ }
+ else
+ {
+ ap.scrollUp(true);
+ }
}
+ /**
+ * DOCUMENT ME!
+ *
+ * @param evt DOCUMENT ME!
+ */
public void doMousePressedDefineMode(MouseEvent evt)
{
- int res = (evt.getX() / av.getCharWidth()) + av.getStartRes();
- int seq = (evt.getY() / av.getCharHeight()) + av.getStartSeq();
+ int res = findRes(evt);
+ int seq = findSeq(evt);
oldSeq = seq;
+ startWrapBlock = wrappedBlock;
+
+ if (av.wrapAlignment && seq > av.alignment.getHeight())
+ {
+ JOptionPane.showInternalMessageDialog(Desktop.desktop,
+ "Cannot edit annotations in wrapped view.",
+ "Wrapped view - no edit",
+ JOptionPane.WARNING_MESSAGE);
+ return;
+ }
+
+ if (seq < 0 || res < 0)
+ {
+ return;
+ }
+
SequenceI sequence = (Sequence) av.getAlignment().getSequenceAt(seq);
if ( (sequence == null) || (res > sequence.getLength()))
@@ -543,7 +1442,7 @@ public class SeqPanel
stretchGroup = null;
}
}
- else if (!stretchGroup.sequences.contains(sequence) ||
+ else if (!stretchGroup.getSequences(null).contains(sequence) ||
(stretchGroup.getStartRes() > res) ||
(stretchGroup.getEndRes() < res))
{
@@ -559,16 +1458,48 @@ public class SeqPanel
(allGroups[i].getEndRes() >= res))
{
stretchGroup = allGroups[i];
- av.setSelectionGroup(stretchGroup);
-
break;
}
}
}
+
+ av.setSelectionGroup(stretchGroup);
+
+ }
+
+ if (javax.swing.SwingUtilities.isRightMouseButton(evt))
+ {
+ SequenceFeature [] allFeatures = findFeaturesAtRes(sequence.getDatasetSequence(),
+ sequence.findPosition(res));
+ Vector links = new Vector();
+ for (int i = 0; i < allFeatures.length; i++)
+ {
+ if (allFeatures[i].links != null)
+ {
+ for (int j = 0; j < allFeatures[i].links.size(); j++)
+ {
+ links.addElement(allFeatures[i].links.elementAt(j));
+ }
+ }
+ }
+
+ jalview.gui.PopupMenu pop = new jalview.gui.PopupMenu(ap, null, links);
+ pop.show(this, evt.getX(), evt.getY());
+ return;
+ }
+
+ if (av.cursorMode)
+ {
+ seqCanvas.cursorX = findRes(evt);
+ seqCanvas.cursorY = findSeq(evt);
+ seqCanvas.repaint();
+ return;
}
if (stretchGroup == null)
{
+ //Only if left mouse button do we want to change group sizes
+
// define a new group here
SequenceGroup sg = new SequenceGroup();
sg.setStartRes(res);
@@ -589,82 +1520,93 @@ public class SeqPanel
SliderPanel.setPIDSliderSource(ap, av.getGlobalColourScheme(),
"Background");
}
- }
- else if (javax.swing.SwingUtilities.isRightMouseButton(evt))
- {
- jalview.gui.PopupMenu pop = new jalview.gui.PopupMenu(ap, null);
- pop.show(this, evt.getX(), evt.getY());
-
- // edit the properties of existing group
- }
-
- if ( (stretchGroup != null) && (stretchGroup.getEndRes() == res))
- {
- // Edit end res position of selected group
- changeEndRes = true;
- }
- else if ( (stretchGroup != null) && (stretchGroup.getStartRes() == res))
- {
- // Edit end res position of selected group
- changeStartRes = true;
+ if ( (stretchGroup != null) && (stretchGroup.getEndRes() == res))
+ {
+ // Edit end res position of selected group
+ changeEndRes = true;
+ }
+ else if ( (stretchGroup != null) &&
+ (stretchGroup.getStartRes() == res))
+ {
+ // Edit end res position of selected group
+ changeStartRes = true;
+ }
+ stretchGroup.getWidth();
}
- stretchGroup.getWidth();
-
seqCanvas.repaint();
}
+ /**
+ * DOCUMENT ME!
+ *
+ * @param evt DOCUMENT ME!
+ */
public void doMouseReleasedDefineMode(MouseEvent evt)
{
- if(mouseDragging)
- {
- stretchGroup.recalcConservation();
- mouseDragging = false;
- }
-
if (stretchGroup == null)
{
return;
}
- if (stretchGroup.cs instanceof ClustalxColourScheme)
+ if (stretchGroup.cs != null)
{
- ( (ClustalxColourScheme) stretchGroup.cs).resetClustalX(stretchGroup.sequences,
- stretchGroup.getWidth());
- }
+ if (stretchGroup.cs instanceof ClustalxColourScheme)
+ {
+ ( (ClustalxColourScheme) stretchGroup.cs).resetClustalX(
+ stretchGroup.getSequences(av.hiddenRepSequences),
+ stretchGroup.getWidth());
+ }
- if (stretchGroup.cs instanceof ConservationColourScheme)
- {
- ConservationColourScheme ccs = (ConservationColourScheme) stretchGroup.cs;
- stretchGroup.cs = ccs;
- SliderPanel.setConservationSlider(ap, stretchGroup.cs,
- stretchGroup.getName());
+ if (stretchGroup.cs instanceof Blosum62ColourScheme
+ || stretchGroup.cs instanceof PIDColourScheme
+ || stretchGroup.cs.conservationApplied()
+ || stretchGroup.cs.getThreshold() > 0)
+ {
+ stretchGroup.recalcConservation();
+ }
- }
- else
- {
- SliderPanel.setPIDSliderSource(ap, stretchGroup.cs,
- stretchGroup.getName());
+ if (stretchGroup.cs.conservationApplied())
+ {
+ SliderPanel.setConservationSlider(ap, stretchGroup.cs,
+ stretchGroup.getName());
+ }
+ else
+ {
+ SliderPanel.setPIDSliderSource(ap, stretchGroup.cs,
+ stretchGroup.getName());
+ }
+ PaintRefresher.Refresh(this, av.getSequenceSetId());
+ ap.paintAlignment(true);
}
changeEndRes = false;
changeStartRes = false;
stretchGroup = null;
- seqCanvas.repaint();
- ap.idPanel.repaint();
+
}
+ /**
+ * DOCUMENT ME!
+ *
+ * @param evt DOCUMENT ME!
+ */
public void doMouseDraggedDefineMode(MouseEvent evt)
{
- int res = (evt.getX() / av.getCharWidth()) + av.getStartRes();
- int y = (evt.getY() / av.getCharHeight()) + av.getStartSeq();
+ int res = findRes(evt);
+ int y = findSeq(evt);
+
+ if (wrappedBlock != startWrapBlock)
+ {
+ return;
+ }
if (stretchGroup == null)
{
return;
}
- if (res > av.alignment.getWidth())
+ if (res >= av.alignment.getWidth())
{
res = av.alignment.getWidth() - 1;
}
@@ -684,10 +1626,6 @@ public class SeqPanel
{
res = av.getStartRes();
}
- else if (res > av.getEndRes())
- {
- res = av.getEndRes();
- }
if (changeEndRes)
{
@@ -715,7 +1653,7 @@ public class SeqPanel
dragDirection = -1;
}
- while ( (y != oldSeq) && (oldSeq > 0) && (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.
@@ -723,12 +1661,16 @@ public class SeqPanel
oldSeq += dragDirection;
+ if (oldSeq < 0)
+ {
+ break;
+ }
+
Sequence nextSeq = (Sequence) av.getAlignment().getSequenceAt(oldSeq);
- if (stretchGroup.sequences.contains(nextSeq))
+ if (stretchGroup.getSequences(null).contains(nextSeq))
{
stretchGroup.deleteSequence(seq, false);
- stretchGroup.deleteSequence(nextSeq, false);
}
else
{
@@ -741,7 +1683,11 @@ public class SeqPanel
}
}
- oldSeq = y;
+ if (oldSeq < 0)
+ {
+ oldSeq = -1;
+ }
+
mouseDragging = true;
if (scrollThread != null)
@@ -752,25 +1698,28 @@ public class SeqPanel
seqCanvas.repaint();
}
- public void doMouseEnteredDefineMode(MouseEvent e)
+ void scrollCanvas(MouseEvent evt)
{
- if (scrollThread != null)
+ if (evt == null)
{
- scrollThread.running = false;
+ if (scrollThread != null)
+ {
+ scrollThread.running = false;
+ scrollThread = null;
+ }
+ mouseDragging = false;
}
- }
-
- public void doMouseExitedDefineMode(MouseEvent e)
- {
- if (av.getWrapAlignment())
+ else
{
- return;
- }
+ if (scrollThread == null)
+ {
+ scrollThread = new ScrollThread();
+ }
- if (mouseDragging)
- {
- scrollThread = new ScrollThread();
+ mouseDragging = true;
+ scrollThread.setEvent(evt);
}
+
}
// this class allows scrolling off the bottom of the visible alignment
@@ -817,17 +1766,17 @@ public class SeqPanel
if (mouseDragging && (evt.getX() < 0))
{
- running = ap.scrollRight(true);
+ running = ap.scrollRight(false);
}
else if (mouseDragging && (evt.getX() >= getWidth()))
{
- running = ap.scrollRight(false);
+ running = ap.scrollRight(true);
}
}
try
{
- Thread.sleep(75);
+ Thread.sleep(20);
}
catch (Exception ex)
{