X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fgui%2FSeqPanel.java;h=cdaa5b949c903dcdc41581c30a1563f9d0afc953;hb=f1cf002d98f35e6d471ebf1af95b37c63cf86d1c;hp=bdfcef466942d8965fa6b621416cf999f9745c77;hpb=506d60f0e188723ddc91c26824b41ac7034df3fe;p=jalview.git
diff --git a/src/jalview/gui/SeqPanel.java b/src/jalview/gui/SeqPanel.java
old mode 100755
new mode 100644
index bdfcef4..cdaa5b9
--- a/src/jalview/gui/SeqPanel.java
+++ b/src/jalview/gui/SeqPanel.java
@@ -1,27 +1,28 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.4)
- * Copyright (C) 2008 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
- *
- * This program is free software; you can redistribute it and/or
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7)
+ * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, 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 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
+ * 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 .
*/
package jalview.gui;
import java.util.*;
+import java.util.List;
import java.awt.*;
import java.awt.event.*;
+
import javax.swing.*;
import jalview.commands.*;
@@ -31,12 +32,13 @@ import jalview.structure.*;
/**
* DOCUMENT ME!
- *
+ *
* @author $author$
- * @version $Revision$
+ * @version $Revision: 1.130 $
*/
public class SeqPanel extends JPanel implements MouseListener,
- MouseMotionListener, MouseWheelListener, SequenceListener
+ MouseMotionListener, MouseWheelListener, SequenceListener,
+ SelectionListener
{
/** DOCUMENT ME!! */
@@ -96,11 +98,11 @@ public class SeqPanel extends JPanel implements MouseListener,
/**
* Creates a new SeqPanel object.
- *
+ *
* @param avp
- * DOCUMENT ME!
+ * DOCUMENT ME!
* @param p
- * DOCUMENT ME!
+ * DOCUMENT ME!
*/
public SeqPanel(AlignViewport av, AlignmentPanel ap)
{
@@ -122,8 +124,9 @@ public class SeqPanel extends JPanel implements MouseListener,
addMouseMotionListener(this);
addMouseListener(this);
addMouseWheelListener(this);
- ssm = StructureSelectionManager.getStructureSelectionManager();
+ ssm = StructureSelectionManager.getStructureSelectionManager(Desktop.instance);
ssm.addStructureViewerListener(this);
+ ssm.addSelectionListener(this);
}
}
@@ -166,10 +169,15 @@ public class SeqPanel extends JPanel implements MouseListener,
}
else
{
+ if (x>seqCanvas.getWidth()+seqCanvas.getWidth())
+ {
+ // make sure we calculate relative to visible alignment, rather than right-hand gutter
+ x = seqCanvas.getX()+seqCanvas.getWidth();
+ }
res = (x / av.getCharWidth()) + av.getStartRes();
}
- if (av.hasHiddenColumns)
+ if (av.hasHiddenColumns())
{
res = av.getColumnSelection().adjustForHiddenColumns(res);
}
@@ -196,13 +204,13 @@ public class SeqPanel extends JPanel implements MouseListener,
y -= hgap;
- seq = Math.min((y % cHeight) / av.getCharHeight(), av.alignment
- .getHeight() - 1);
+ seq = Math.min((y % cHeight) / av.getCharHeight(),
+ av.getAlignment().getHeight() - 1);
}
else
{
seq = Math.min((y / av.getCharHeight()) + av.getStartSeq(),
- av.alignment.getHeight() - 1);
+ av.getAlignment().getHeight() - 1);
}
return seq;
@@ -290,7 +298,7 @@ public class SeqPanel extends JPanel implements MouseListener,
void setCursorPosition()
{
- SequenceI sequence = (Sequence) av.getAlignment().getSequenceAt(
+ SequenceI sequence = av.getAlignment().getSequenceAt(
seqCanvas.cursorY);
seqCanvas.cursorX = sequence.findIndex(getKeyboardNo1() - 1);
@@ -301,19 +309,19 @@ public class SeqPanel extends JPanel implements MouseListener,
{
seqCanvas.cursorX += dx;
seqCanvas.cursorY += dy;
- if (av.hasHiddenColumns && !av.colSel.isVisible(seqCanvas.cursorX))
+ if (av.hasHiddenColumns() && !av.getColumnSelection().isVisible(seqCanvas.cursorX))
{
int original = seqCanvas.cursorX - dx;
- int maxWidth = av.alignment.getWidth();
+ int maxWidth = av.getAlignment().getWidth();
- while (!av.colSel.isVisible(seqCanvas.cursorX)
+ while (!av.getColumnSelection().isVisible(seqCanvas.cursorX)
&& seqCanvas.cursorX < maxWidth && seqCanvas.cursorX > 0)
{
seqCanvas.cursorX += dx;
}
if (seqCanvas.cursorX >= maxWidth
- || !av.colSel.isVisible(seqCanvas.cursorX))
+ || !av.getColumnSelection().isVisible(seqCanvas.cursorX))
{
seqCanvas.cursorX = original;
}
@@ -328,18 +336,18 @@ public class SeqPanel extends JPanel implements MouseListener,
{
seqCanvas.cursorX = 0;
}
- else if (seqCanvas.cursorX > av.alignment.getWidth() - 1)
+ else if (seqCanvas.cursorX > av.getAlignment().getWidth() - 1)
{
- seqCanvas.cursorX = av.alignment.getWidth() - 1;
+ seqCanvas.cursorX = av.getAlignment().getWidth() - 1;
}
if (seqCanvas.cursorY < 0)
{
seqCanvas.cursorY = 0;
}
- else if (seqCanvas.cursorY > av.alignment.getHeight() - 1)
+ else if (seqCanvas.cursorY > av.getAlignment().getHeight() - 1)
{
- seqCanvas.cursorY = av.alignment.getHeight() - 1;
+ seqCanvas.cursorY = av.getAlignment().getHeight() - 1;
}
endEditing();
@@ -359,7 +367,7 @@ public class SeqPanel extends JPanel implements MouseListener,
}
if (!av.wrapAlignment)
{
- while (seqCanvas.cursorX < av.colSel
+ while (seqCanvas.cursorX < av.getColumnSelection()
.adjustForHiddenColumns(av.startRes))
{
if (!ap.scrollRight(false))
@@ -367,7 +375,7 @@ public class SeqPanel extends JPanel implements MouseListener,
break;
}
}
- while (seqCanvas.cursorX > av.colSel
+ while (seqCanvas.cursorX > av.getColumnSelection()
.adjustForHiddenColumns(av.endRes))
{
if (!ap.scrollRight(true))
@@ -377,7 +385,7 @@ public class SeqPanel extends JPanel implements MouseListener,
}
}
}
- setStatusMessage(av.alignment.getSequenceAt(seqCanvas.cursorY),
+ setStatusMessage(av.getAlignment().getSequenceAt(seqCanvas.cursorY),
seqCanvas.cursorX, seqCanvas.cursorY);
seqCanvas.repaint();
@@ -385,17 +393,17 @@ public class SeqPanel extends JPanel implements MouseListener,
void setSelectionAreaAtCursor(boolean topLeft)
{
- SequenceI sequence = (Sequence) av.getAlignment().getSequenceAt(
+ SequenceI sequence = av.getAlignment().getSequenceAt(
seqCanvas.cursorY);
if (av.getSelectionGroup() != null)
{
- SequenceGroup sg = av.selectionGroup;
+ SequenceGroup sg = av.getSelectionGroup();
// Find the top and bottom of this group
- int min = av.alignment.getHeight(), max = 0;
+ int min = av.getAlignment().getHeight(), max = 0;
for (int i = 0; i < sg.getSize(); i++)
{
- int index = av.alignment.findIndex(sg.getSequenceAt(i));
+ int index = av.getAlignment().findIndex(sg.getSequenceAt(i));
if (index > max)
{
max = index;
@@ -440,7 +448,7 @@ public class SeqPanel extends JPanel implements MouseListener,
sg.getSequences(null).clear();
for (int i = min; i < max; i++)
{
- sg.addSequence(av.alignment.getSequenceAt(i), false);
+ sg.addSequence(av.getAlignment().getSequenceAt(i), false);
}
}
}
@@ -455,6 +463,7 @@ public class SeqPanel extends JPanel implements MouseListener,
}
ap.paintAlignment(false);
+ av.sendSelection();
}
void insertGapAtCursor(boolean group)
@@ -462,7 +471,7 @@ public class SeqPanel extends JPanel implements MouseListener,
groupEditing = group;
startseq = seqCanvas.cursorY;
lastres = seqCanvas.cursorX;
- editSequence(true, seqCanvas.cursorX + getKeyboardNo1());
+ editSequence(true, false, seqCanvas.cursorX + getKeyboardNo1());
endEditing();
}
@@ -471,10 +480,18 @@ public class SeqPanel extends JPanel implements MouseListener,
groupEditing = group;
startseq = seqCanvas.cursorY;
lastres = seqCanvas.cursorX + getKeyboardNo1();
- editSequence(false, seqCanvas.cursorX);
+ editSequence(false, false, seqCanvas.cursorX);
endEditing();
}
+ void insertNucAtCursor(boolean group,String nuc){
+ groupEditing = group;
+ startseq = seqCanvas.cursorY;
+ lastres = seqCanvas.cursorX;
+ editSequence(false, true, seqCanvas.cursorX + getKeyboardNo1());
+ endEditing();
+ }
+
void numberPressed(char value)
{
if (keyboardNo1 == null)
@@ -518,10 +535,11 @@ public class SeqPanel extends JPanel implements MouseListener,
/**
* DOCUMENT ME!
- *
+ *
* @param evt
- * DOCUMENT ME!
+ * DOCUMENT ME!
*/
+ @Override
public void mouseReleased(MouseEvent evt)
{
mouseDragging = false;
@@ -538,10 +556,11 @@ public class SeqPanel extends JPanel implements MouseListener,
/**
* DOCUMENT ME!
- *
+ *
* @param evt
- * DOCUMENT ME!
+ * DOCUMENT ME!
*/
+ @Override
public void mousePressed(MouseEvent evt)
{
lastMousePress = evt.getPoint();
@@ -591,6 +610,7 @@ public class SeqPanel extends JPanel implements MouseListener,
String lastMessage;
+ @Override
public void mouseOverSequence(SequenceI sequence, int index, int pos)
{
String tmp = sequence.hashCode() + " " + index + " " + pos;
@@ -598,16 +618,25 @@ public class SeqPanel extends JPanel implements MouseListener,
if (lastMessage == null || !lastMessage.equals(tmp))
{
// System.err.println("mouseOver Sequence: "+tmp);
- ssm.mouseOverSequence(sequence, index, pos);
+ ssm.mouseOverSequence(sequence, index, pos, av);
}
lastMessage = tmp;
}
+ @Override
public void highlightSequence(SearchResults results)
{
+ if (av.followHighlight)
+ {
+ if (ap.scrollToPosition(results, false))
+ {
+ seqCanvas.revalidate();
+ }
+ }
seqCanvas.highlightSearchResults(results);
}
+ @Override
public void updateColours(SequenceI seq, int index)
{
System.out.println("update the seqPanel colours");
@@ -616,10 +645,11 @@ public class SeqPanel extends JPanel implements MouseListener,
/**
* DOCUMENT ME!
- *
+ *
* @param evt
- * DOCUMENT ME!
+ * DOCUMENT ME!
*/
+ @Override
public void mouseMoved(MouseEvent evt)
{
if (editingSeqs)
@@ -650,7 +680,7 @@ public class SeqPanel extends JPanel implements MouseListener,
tooltipText.setLength(6); // Cuts the buffer back to
- SequenceGroup[] groups = av.alignment.findAllGroups(sequence);
+ SequenceGroup[] groups = av.getAlignment().findAllGroups(sequence);
if (groups != null)
{
for (int g = 0; g < groups.length; g++)
@@ -679,42 +709,116 @@ public class SeqPanel extends JPanel implements MouseListener,
// use aa to see if the mouse pointer is on a
if (av.showSequenceFeatures)
{
- SequenceFeature[] features = findFeaturesAtRes(sequence
- .getDatasetSequence(), sequence.findPosition(res));
+ int rpos;
+ SequenceFeature[] features = findFeaturesAtRes(
+ sequence.getDatasetSequence(),
+ rpos = sequence.findPosition(res));
+ appendFeatures(tooltipText, linkImageURL.toString(), rpos, features,
+ this.ap.seqPanel.seqCanvas.fr.minmax);
+ }
+ if (tooltipText.length() == 6) //
+ {
+ setToolTipText(null);
+ lastTooltip = null;
+ }
+ else
+ {
+ tooltipText.append("");
+ if (lastTooltip == null
+ || !lastTooltip.equals(tooltipText.toString()))
+ {
+ setToolTipText(tooltipText.toString());
+ lastTooltip = tooltipText.toString();
+ }
+
+ }
+
+ }
+
+ private Point lastp = null;
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see javax.swing.JComponent#getToolTipLocation(java.awt.event.MouseEvent)
+ */
+ public Point getToolTipLocation(MouseEvent event)
+ {
+ int x = event.getX(), w = getWidth();
+ int wdth = (w - x < 200) ? -(w / 2) : 5; // switch sides when tooltip is too
+ // close to edge
+ Point p = lastp;
+ if (!event.isShiftDown() || p == null)
+ {
+ p = (tooltipText != null && tooltipText.length() > 6) ? new Point(
+ event.getX() + wdth, event.getY() - 20) : null;
+ }
+ /*
+ * TODO: try to modify position region is not obcured by tooltip
+ */
+ return lastp = p;
+ }
+
+ /**
+ * appends the features at rpos to the given stringbuffer ready for display in
+ * a tooltip
+ *
+ * @param tooltipText2
+ * @param linkImageURL
+ * @param rpos
+ * @param features
+ * TODO refactor to Jalview 'utilities' somehow.
+ */
+ public void appendFeatures(StringBuffer tooltipText2,
+ String linkImageURL, int rpos, SequenceFeature[] features)
+ {
+ appendFeatures(tooltipText2, linkImageURL, rpos, features, null);
+ }
- if (features != null)
+ public void appendFeatures(StringBuffer tooltipText2, String string,
+ int rpos, SequenceFeature[] features, Hashtable minmax)
+ {
+ String tmpString;
+ if (features != null)
+ {
+ for (int i = 0; i < features.length; i++)
{
- for (int i = 0; i < features.length; i++)
+ if (features[i].getType().equals("disulfide bond"))
{
- if (features[i].getType().equals("disulfide bond"))
+ if (features[i].getBegin() == rpos
+ || features[i].getEnd() == rpos)
{
- if (features[i].getBegin() == sequence.findPosition(res)
- || features[i].getEnd() == sequence.findPosition(res))
+ if (tooltipText2.length() > 6)
{
- if (tooltipText.length() > 6)
- {
- tooltipText.append("
");
- }
- tooltipText.append("disulfide bond " + features[i].getBegin()
- + ":" + features[i].getEnd());
- if (features[i].links != null)
- {
- tooltipText.append(" ");
- }
+ tooltipText2.append("
");
+ }
+ tooltipText2.append("disulfide bond " + features[i].getBegin()
+ + ":" + features[i].getEnd());
+ if (features[i].links != null)
+ {
+ tooltipText2.append(" ");
}
}
- else
+ }
+ else
+ {
+ if (tooltipText2.length() > 6)
{
- if (tooltipText.length() > 6)
+ tooltipText2.append("
");
+ }
+ // TODO: remove this hack to display link only features
+ boolean linkOnly = features[i].getValue("linkonly") != null;
+ if (!linkOnly)
+ {
+ tooltipText2.append(features[i].getType() + " ");
+ if (rpos != 0)
{
- tooltipText.append("
");
+ // we are marking a positional feature
+ tooltipText2.append(features[i].begin);
}
-
- tooltipText.append(features[i].getType() + " "
- + features[i].begin);
if (features[i].begin != features[i].end)
{
- tooltipText.append(" " + features[i].end);
+ tooltipText2.append(" " + features[i].end);
}
if (features[i].getDescription() != null
@@ -722,17 +826,20 @@ public class SeqPanel extends JPanel implements MouseListener,
.getType()))
{
tmpString = features[i].getDescription();
- int startTag = tmpString.toUpperCase().indexOf("");
+ String tmp2up=tmpString.toUpperCase();
+ int startTag = tmp2up.indexOf("");
if (startTag > -1)
{
tmpString = tmpString.substring(startTag + 6);
+ tmp2up = tmp2up.substring(startTag+6);
}
- int endTag = tmpString.toUpperCase().indexOf("");
+ int endTag = tmp2up.indexOf("");
if (endTag > -1)
{
tmpString = tmpString.substring(0, endTag);
+ tmp2up = tmp2up.substring(0, endTag);
}
- endTag = tmpString.toUpperCase().indexOf("