X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fdatamodel%2FSequenceGroup.java;h=df8c6ea9cc4b552dd486854624fb6bf79efa97da;hb=2d7deb9d3e1ddc98abae846c8ffbc62606b023be;hp=2bdd5f84f170d727e589511c12f0bf06c8542ca8;hpb=7abeaf76ba3913ccb95139df58b353bdde49429c;p=jalview.git diff --git a/src/jalview/datamodel/SequenceGroup.java b/src/jalview/datamodel/SequenceGroup.java index 2bdd5f8..df8c6ea 100755 --- a/src/jalview/datamodel/SequenceGroup.java +++ b/src/jalview/datamodel/SequenceGroup.java @@ -119,6 +119,7 @@ public class SequenceGroup SequenceI [] seqs = new SequenceI[iSize]; SequenceI [] inorder = getSequencesInOrder(align); + for (int i = 0; i < iSize; i++) { SequenceI seq = inorder[i]; @@ -316,7 +317,7 @@ public class SequenceGroup */ public void addSequence(SequenceI s, boolean recalc) { - if (!sequences.contains(s)) + if (s!=null && !sequences.contains(s)) { sequences.addElement(s); } @@ -337,7 +338,7 @@ public class SequenceGroup try { - cs.setConsensus(AAFrequency.calculate(sequences, 0, getWidth())); + cs.setConsensus(AAFrequency.calculate(sequences, startRes, endRes+1)); if (cs instanceof ClustalxColourScheme) { @@ -348,7 +349,7 @@ public class SequenceGroup { Conservation c = new Conservation(groupName, ResidueProperties.propHash, 3, sequences, - 0, getWidth()); + startRes, endRes+1); c.calculate(); c.verdict(false, 25);