X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fdatamodel%2FSequence.java;h=0dec805076fce9bdbdf0fbb834a468834605421c;hb=c16afbb4d0e2672fdc54d32778b6d53f09c5d86c;hp=3853af9891fcd5efd390bdc95438ffe97d9d3f8f;hpb=588042b69abf8e60bcc950b24c283933c7dd422f;p=jalview.git diff --git a/src/jalview/datamodel/Sequence.java b/src/jalview/datamodel/Sequence.java index 3853af9..0dec805 100755 --- a/src/jalview/datamodel/Sequence.java +++ b/src/jalview/datamodel/Sequence.java @@ -18,166 +18,416 @@ */ package jalview.datamodel; -import MCview.*; - -import jalview.analysis.*; - import java.awt.*; import java.util.*; -public class Sequence implements SequenceI { - protected String name; - protected String sequence; - protected String description; - protected int start; - protected int end; - protected String displayId; - protected Color color = Color.white; - String pdbId; - public Vector sequenceFeatures = new Vector(); - - public Sequence(String name, String sequence, int start, int end) { - this.name = name; - this.sequence = sequence; - this.start = start; - this.end = end; +/** + * DOCUMENT ME! + * + * @author $author$ + * @version $Revision$ + */ +public class Sequence implements SequenceI +{ + SequenceI datasetSequence; + String name; + String sequence; + String description; + int start; + int end; + Color color = Color.white; + Vector pdbIds; + String vamsasId; + Vector dbrefs; + + /** This annotation is displayed below the alignment but the + * positions are tied to the residues of this sequence */ + Vector annotation; + + /** DOCUMENT ME!! */ + public SequenceFeature [] sequenceFeatures; + + /** This array holds hidden sequences + * of which this sequence is the representitive member of a group + */ + SequenceGroup hiddenSequences; + + /** + * Creates a new Sequence object. + * + * @param name DOCUMENT ME! + * @param sequence DOCUMENT ME! + * @param start DOCUMENT ME! + * @param end DOCUMENT ME! + */ + public Sequence(String name, String sequence, int start, int end) + { + this.name = name; + this.sequence = sequence; + this.start = start; + this.end = end; + + parseId(); + + checkValidRange(); + } + + com.stevesoft.pat.Regex limitrx = new com.stevesoft.pat.Regex( + "[/][0-9]{1,}[-][0-9]{1,}$"); + com.stevesoft.pat.Regex endrx = new com.stevesoft.pat.Regex( + "[0-9]{1,}$"); + + void parseId() + { + // Does sequence have the /start-end signiature? + if(limitrx.search(name)) + { + name = limitrx.left(); + endrx.search(limitrx.stringMatched()); + setStart( Integer.parseInt( limitrx.stringMatched().substring(1,endrx.matchedFrom()-1 ))); + setEnd( Integer.parseInt( endrx.stringMatched() )); + } + } + + void checkValidRange() + { + if (end < 1) + { + int endRes = 0; + char ch; + for (int j = 0; j < sequence.length(); j++) + { + ch = sequence.charAt(j); + if (!jalview.util.Comparison.isGap( (ch))) + { + endRes++; + } + } + if (endRes > 0) + { + endRes += start - 1; + } + + this.end = endRes; + } - setDisplayId(); } - public Sequence(String name, String sequence) { - this(name, sequence, 1, sequence.length()); + /** + * Creates a new Sequence object. + * + * @param name DOCUMENT ME! + * @param sequence DOCUMENT ME! + */ + public Sequence(String name, String sequence) + { + this(name, sequence, 1, -1); } - public Sequence(SequenceI seq) { + /** + * Creates a new Sequence object. + * + * @param seq DOCUMENT ME! + */ + public Sequence(SequenceI seq) + { this(seq.getName(), seq.getSequence(), seq.getStart(), seq.getEnd()); } - public void setSequenceFeatures(Vector v) { - sequenceFeatures = v; + /** + * DOCUMENT ME! + * + * @param v DOCUMENT ME! + */ + public void setSequenceFeatures(SequenceFeature [] features) + { + sequenceFeatures = features; } - public Vector getSequenceFeatures() { + public synchronized void addSequenceFeature(SequenceFeature sf) + { + if(sequenceFeatures==null) + { + sequenceFeatures = new SequenceFeature[0]; + } + + for(int i=0; i= sequence.length()) { + if (start >= sequence.length()) + { return ""; } - if (end >= sequence.length()) { + if (end >= sequence.length()) + { end = sequence.length(); } return this.sequence.substring(start, end); } - public char getCharAt(int i) { - if (i < sequence.length()) { + /** + * DOCUMENT ME! + * + * @param i DOCUMENT ME! + * + * @return DOCUMENT ME! + */ + public char getCharAt(int i) + { + if (i < sequence.length()) + { return sequence.charAt(i); - } else { + } + else + { return ' '; } } - public void setDescription(String desc) { + /** + * DOCUMENT ME! + * + * @param desc DOCUMENT ME! + */ + public void setDescription(String desc) + { this.description = desc; } - public String getDescription() { + /** + * DOCUMENT ME! + * + * @return DOCUMENT ME! + */ + public String getDescription() + { return this.description; } - public int findIndex(int pos) { + /** + * DOCUMENT ME! + * + * @param pos DOCUMENT ME! + * + * @return DOCUMENT ME! + */ + public int findIndex(int pos) + { // returns the alignment position for a residue int j = start; int i = 0; - while ((i < sequence.length()) && (j <= end) && (j <= pos)) { - char c = sequence.charAt(i); - - if (!jalview.util.Comparison.isGap((c))) { + while ((i < sequence.length()) && (j <= end) && (j <= pos)) + { + if (!jalview.util.Comparison.isGap(sequence.charAt(i))) + { j++; } i++; } - if ((j == end) && (j < pos)) { + if ((j == end) && (j < pos)) + { return end + 1; - } else { + } + else + { return i; } } - public int findPosition(int i) { + /** + * DOCUMENT ME! + * + * @param i DOCUMENT ME! + * + * @return DOCUMENT ME! + */ + public int findPosition(int i) + { // Returns the sequence position for an alignment position int j = 0; int pos = start; - while ((j < i) && (j < sequence.length())) { - char c = sequence.charAt(j); - - if (!jalview.util.Comparison.isGap((c))) { + while ((j < i) && (j < sequence.length())) + { + if (!jalview.util.Comparison.isGap((sequence.charAt(j)))) + { pos++; } @@ -187,15 +437,23 @@ public class Sequence implements SequenceI { return pos; } - public int[] gapMap() { + /** + * DOCUMENT ME! + * + * @return DOCUMENT ME! + */ + public int[] gapMap() + { // Returns an int array giving the position of each residue in the sequence in the alignment String seq = jalview.analysis.AlignSeq.extractGaps("-. ", sequence); int[] map = new int[seq.length()]; int j = 0; int p = 0; - while (j < sequence.length()) { - if (!jalview.util.Comparison.isGap(sequence.charAt(j))) { + while (j < sequence.length()) + { + if (!jalview.util.Comparison.isGap(sequence.charAt(j))) + { map[p++] = j; } @@ -205,37 +463,63 @@ public class Sequence implements SequenceI { return map; } - public void deleteCharAt(int i) { - if (i >= sequence.length()) { + /** + * DOCUMENT ME! + * + * @param i DOCUMENT ME! + */ + public void deleteCharAt(int i) + { + if (i >= sequence.length()) + { return; } sequence = sequence.substring(0, i) + sequence.substring(i + 1); } - public void deleteChars(int i, int j) { - if (i >= sequence.length()) { + /** + * DOCUMENT ME! + * + * @param i DOCUMENT ME! + * @param j DOCUMENT ME! + */ + public void deleteChars(int i, int j) + { + if (i >= sequence.length()) + { return; } - if (j >= sequence.length()) { + if (j >= sequence.length()) + { sequence = sequence.substring(0, i); - } else { + } + else + { sequence = sequence.substring(0, i) + sequence.substring(j); } } - public void insertCharAt(int i, char c) { - insertCharAt(i, c, true); - } - public void insertCharAt(int i, char c, boolean chop) { + /** + * DOCUMENT ME! + * + * @param i DOCUMENT ME! + * @param c DOCUMENT ME! + * @param chop DOCUMENT ME! + */ + public void insertCharAt(int i, char c) + { String tmp = new String(sequence); - if (i < sequence.length()) { + if (i < sequence.length()) + { sequence = tmp.substring(0, i) + String.valueOf(c) + tmp.substring(i); - } else { + } + else + { // JBPNote : padding char at end of sequence. We'll not get away with this when we insert residues, I bet! char[] ch = new char[(1 + i) - sequence.length()]; @@ -246,11 +530,162 @@ public class Sequence implements SequenceI { } } - public void setColor(Color c) { + /** + * DOCUMENT ME! + * + * @param c DOCUMENT ME! + */ + public void setColor(Color c) + { this.color = c; } - public Color getColor() { + /** + * DOCUMENT ME! + * + * @return DOCUMENT ME! + */ + public Color getColor() + { return color; } + + public String getVamsasId() + { + return vamsasId; + } + + public void setVamsasId(String id) + { + vamsasId = id; + } + + public void setDBRef(Vector dbref) + { + dbrefs = dbref; + } + public Vector getDBRef() + { + return dbrefs; + } + + public void addDBRef(DBRefEntry entry) + { + if(dbrefs == null) + dbrefs = new Vector(); + + dbrefs.addElement(entry); + } + + public void setDatasetSequence(SequenceI seq) + { + datasetSequence = seq; + } + + public SequenceI getDatasetSequence() + { + return datasetSequence; + } + + public AlignmentAnnotation [] getAnnotation() + { + if(annotation==null) + return null; + + AlignmentAnnotation [] ret = new AlignmentAnnotation[annotation.size()]; + for(int r = 0; rsequence.length()) + end = sequence.length(); + + if (start > 0) + { + newSeq.append(sequence.substring(0, start)); + } + + if (toUpper) + newSeq.append(sequence.substring(start, end).toUpperCase()); + else + newSeq.append(sequence.substring(start, end).toLowerCase()); + + if (end < sequence.length()) + newSeq.append(sequence.substring(end)); + + sequence = newSeq.toString(); + } + + public void toggleCase(int start, int end) + { + StringBuffer newSeq = new StringBuffer(); + + if(end>sequence.length()) + end = sequence.length(); + + if (start > 0) + { + newSeq.append(sequence.substring(0, start)); + } + + char nextChar; + for(int c=start; c