X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=inline;f=src%2Fjalview%2Fdatamodel%2FAlignment.java;h=42559c620ad74ca9837f73da38af6dca0eb9ec91;hb=85024c0dee90b249ba1e03dc991ce0a4d0156cda;hp=afe70328877239ab9a727083384405a44644bb14;hpb=73ffad785a317d4014bc448ea4d8a7303e8a4350;p=jalview.git
diff --git a/src/jalview/datamodel/Alignment.java b/src/jalview/datamodel/Alignment.java
index afe7032..42559c6 100755
--- a/src/jalview/datamodel/Alignment.java
+++ b/src/jalview/datamodel/Alignment.java
@@ -1,20 +1,19 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Development Version 2.4.1)
- * Copyright (C) 2009 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.6)
+ * Copyright (C) 2010 J Procter, AM Waterhouse, 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 file is part of Jalview.
*
- * 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.
+ * 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.
*
- * 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 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.datamodel;
@@ -27,7 +26,7 @@ import jalview.analysis.*;
*/
/**
* @author JimP
- *
+ *
*/
public class Alignment implements AlignmentI
{
@@ -88,7 +87,7 @@ public class Alignment implements AlignmentI
* Make a new alignment from an array of SeqCigars
*
* @param seqs
- * SeqCigar[]
+ * SeqCigar[]
*/
public Alignment(SeqCigar[] alseqs)
{
@@ -104,7 +103,7 @@ public class Alignment implements AlignmentI
* appropriately.
*
* @param compactAlignment
- * CigarArray
+ * CigarArray
*/
public static AlignmentI createAlignment(CigarArray compactAlignment)
{
@@ -138,13 +137,13 @@ public class Alignment implements AlignmentI
* DOCUMENT ME!
*
* @param i
- * DOCUMENT ME!
+ * DOCUMENT ME!
*
* @return DOCUMENT ME!
*/
public SequenceI getSequenceAt(int i)
{
- if (i < sequences.size())
+ if (i>-1 && i < sequences.size())
{
return (SequenceI) sequences.elementAt(i);
}
@@ -238,7 +237,7 @@ public class Alignment implements AlignmentI
* DOCUMENT ME!
*
* @param s
- * DOCUMENT ME!
+ * DOCUMENT ME!
*/
public void deleteSequence(SequenceI s)
{
@@ -249,7 +248,7 @@ public class Alignment implements AlignmentI
* DOCUMENT ME!
*
* @param i
- * DOCUMENT ME!
+ * DOCUMENT ME!
*/
public void deleteSequence(int i)
{
@@ -280,7 +279,7 @@ public class Alignment implements AlignmentI
* DOCUMENT ME!
*
* @param s
- * DOCUMENT ME!
+ * DOCUMENT ME!
*
* @return DOCUMENT ME!
*/
@@ -344,10 +343,71 @@ public class Alignment implements AlignmentI
}
/**
- * DOCUMENT ME!
+ * remove any annotation that references gp
+ *
+ * @param gp
+ * (if null, removes all group associated annotation)
*/
+ private void removeAnnotationForGroup(SequenceGroup gp)
+ {
+ if (annotations == null || annotations.length == 0)
+ {
+ return;
+ }
+ // remove annotation very quickly
+ AlignmentAnnotation[] t, todelete = new AlignmentAnnotation[annotations.length], tokeep = new AlignmentAnnotation[annotations.length];
+ int i, p, k;
+ if (gp == null)
+ {
+ for (i = 0, p = 0, k = 0; i < annotations.length; i++)
+ {
+ if (annotations[i].groupRef != null)
+ {
+ todelete[p++] = annotations[i];
+ }
+ else
+ {
+ tokeep[k++] = annotations[i];
+ }
+ }
+ }
+ else
+ {
+ for (i = 0, p = 0, k = 0; i < annotations.length; i++)
+ {
+ if (annotations[i].groupRef == gp)
+ {
+ todelete[p++] = annotations[i];
+ }
+ else
+ {
+ tokeep[k++] = annotations[i];
+ }
+ }
+ }
+ if (p > 0)
+ {
+ // clear out the group associated annotation.
+ for (i = 0; i < p; i++)
+ {
+ unhookAnnotation(todelete[i]);
+ todelete[i] = null;
+ }
+ t = new AlignmentAnnotation[k];
+ for (i = 0; i < k; i++)
+ {
+ t[i] = tokeep[i];
+ }
+ annotations = t;
+ }
+ }
+
public void deleteAllGroups()
{
+ if (annotations != null)
+ {
+ removeAnnotationForGroup(null);
+ }
groups.removeAllElements();
}
@@ -356,14 +416,7 @@ public class Alignment implements AlignmentI
{
if (groups.contains(g))
{
- if (annotations!=null && annotations.length>0)
- {
- if (g.hasAnnotationRows())
- { // remove any annotation references.
- deleteAnnotation(g.getConsensus());// todo - create=false flag so we don't create another object unnecessarily
- deleteAnnotation(g.getConservationRow());
- }
- }
+ removeAnnotationForGroup(g);
groups.removeElement(g);
}
}
@@ -388,7 +441,7 @@ public class Alignment implements AlignmentI
* (non-Javadoc)
*
* @see jalview.datamodel.AlignmentI#findName(SequenceI, java.lang.String,
- * boolean)
+ * boolean)
*/
public SequenceI findName(SequenceI startAfter, String token, boolean b)
{
@@ -479,7 +532,8 @@ public class Alignment implements AlignmentI
/*
* (non-Javadoc)
*
- * @see jalview.datamodel.AlignmentI#findIndex(jalview.datamodel.SearchResults)
+ * @see
+ * jalview.datamodel.AlignmentI#findIndex(jalview.datamodel.SearchResults)
*/
public int findIndex(SearchResults results)
{
@@ -530,7 +584,7 @@ public class Alignment implements AlignmentI
* DOCUMENT ME!
*
* @param gc
- * DOCUMENT ME!
+ * DOCUMENT ME!
*/
public void setGapCharacter(char gc)
{
@@ -539,8 +593,8 @@ public class Alignment implements AlignmentI
for (int i = 0; i < sequences.size(); i++)
{
Sequence seq = (Sequence) sequences.elementAt(i);
- seq.setSequence(seq.getSequenceAsString().replace('.', gc).replace(
- '-', gc).replace(' ', gc));
+ seq.setSequence(seq.getSequenceAsString().replace('.', gc)
+ .replace('-', gc).replace(' ', gc));
}
}
@@ -554,20 +608,36 @@ public class Alignment implements AlignmentI
return gapCharacter;
}
- /**
- * DOCUMENT ME!
+ /*
+ * (non-Javadoc)
*
- * @return DOCUMENT ME!
+ * @see jalview.datamodel.AlignmentI#isAligned()
*/
public boolean isAligned()
{
- int width = getWidth();
+ return isAligned(false);
+ }
+ /*
+ * (non-Javadoc)
+ *
+ * @see jalview.datamodel.AlignmentI#isAligned(boolean)
+ */
+ public boolean isAligned(boolean includeHidden)
+ {
+ int width = getWidth();
+ if (hiddenSequences == null || hiddenSequences.getSize() == 0)
+ {
+ includeHidden = true; // no hidden sequences to check against.
+ }
for (int i = 0; i < sequences.size(); i++)
{
- if (getSequenceAt(i).getLength() != width)
+ if (includeHidden || !hiddenSequences.isHidden(getSequenceAt(i)))
{
- return false;
+ if (getSequenceAt(i).getLength() != width)
+ {
+ return false;
+ }
}
}
@@ -577,7 +647,8 @@ public class Alignment implements AlignmentI
/*
* (non-Javadoc)
*
- * @see jalview.datamodel.AlignmentI#deleteAnnotation(jalview.datamodel.AlignmentAnnotation)
+ * @seejalview.datamodel.AlignmentI#deleteAnnotation(jalview.datamodel.
+ * AlignmentAnnotation)
*/
public boolean deleteAnnotation(AlignmentAnnotation aa)
{
@@ -612,22 +683,45 @@ public class Alignment implements AlignmentI
if (swap)
{
annotations = temp;
- if (aa.sequenceRef != null)
- aa.sequenceRef.removeAlignmentAnnotation(aa);
+ unhookAnnotation(aa);
}
return swap;
}
- /* (non-Javadoc)
- * @see jalview.datamodel.AlignmentI#addAnnotation(jalview.datamodel.AlignmentAnnotation)
+ /**
+ * remove any object references associated with this annotation
+ *
+ * @param aa
+ */
+ private void unhookAnnotation(AlignmentAnnotation aa)
+ {
+ if (aa.sequenceRef != null)
+ {
+ aa.sequenceRef.removeAlignmentAnnotation(aa);
+ }
+ if (aa.groupRef != null)
+ {
+ // probably need to do more here in the future (post 2.5.0)
+ aa.groupRef = null;
+ }
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @seejalview.datamodel.AlignmentI#addAnnotation(jalview.datamodel.
+ * AlignmentAnnotation)
*/
public void addAnnotation(AlignmentAnnotation aa)
{
addAnnotation(aa, -1);
}
-
- /* (non-Javadoc)
- * @see jalview.datamodel.AlignmentI#addAnnotation(jalview.datamodel.AlignmentAnnotation, int)
+
+ /*
+ * (non-Javadoc)
+ *
+ * @seejalview.datamodel.AlignmentI#addAnnotation(jalview.datamodel.
+ * AlignmentAnnotation, int)
*/
public void addAnnotation(AlignmentAnnotation aa, int pos)
{
@@ -639,21 +733,25 @@ public class Alignment implements AlignmentI
AlignmentAnnotation[] temp = new AlignmentAnnotation[aSize];
int i = 0;
- if (pos==-1 || pos>=aSize) {
+ if (pos == -1 || pos >= aSize)
+ {
temp[aSize - 1] = aa;
- } else {
+ }
+ else
+ {
temp[pos] = aa;
}
if (aSize > 1)
{
- int p=0;
- for (i = 0; i < (aSize-1); i++,p++)
+ int p = 0;
+ for (i = 0; i < (aSize - 1); i++, p++)
{
- if (p==pos)
+ if (p == pos)
{
p++;
}
- if (pmaxLength)
+ ends[i * 2] = j;
+ hitres = true;
+ }
+ else
+ {
+ ends[i * 2 + 1] = j;
+ if (j - ends[i * 2] > maxLength)
{
- maxLength = j-ends[i*2];
+ maxLength = j - ends[i * 2];
}
}
}
@@ -860,50 +965,56 @@ public class Alignment implements AlignmentI
maxLength++;
// now edit the flanking gaps to justify to either left or right
- int cLength,extent,diff;
+ int cLength, extent, diff;
for (int i = 0; i < sequences.size(); i++)
{
current = getSequenceAt(i);
-
- cLength = 1+ends[i*2+1]-ends[i*2];
- diff = maxLength-cLength; // number of gaps to indent
+
+ cLength = 1 + ends[i * 2 + 1] - ends[i * 2];
+ diff = maxLength - cLength; // number of gaps to indent
extent = current.getLength();
if (right)
{
// right justify
- if (extent>ends[i*2+1])
+ if (extent > ends[i * 2 + 1])
{
- current.deleteChars(ends[i*2+1]+1, extent);
+ current.deleteChars(ends[i * 2 + 1] + 1, extent);
modified = true;
}
- if (ends[i*2]>diff)
+ if (ends[i * 2] > diff)
{
- current.deleteChars(0, ends[i*2]-diff);
+ current.deleteChars(0, ends[i * 2] - diff);
modified = true;
- } else {
- if (ends[i*2]0)
+ if (ends[i * 2] > 0)
{
- current.deleteChars(0, ends[i*2]);
+ current.deleteChars(0, ends[i * 2]);
modified = true;
- ends[i*2+1]-=ends[i*2];
- extent-=ends[i*2];
+ ends[i * 2 + 1] -= ends[i * 2];
+ extent -= ends[i * 2];
}
- if (extent>maxLength)
+ if (extent > maxLength)
{
- current.deleteChars(maxLength+1, extent);
+ current.deleteChars(maxLength + 1, extent);
modified = true;
- } else {
- if (extent