X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fanalysis%2FAlignmentUtils.java;h=f1084a7d74e40b05120a189540077ee1fddc29d0;hb=947109cebef3e98693ffc0a70b5bffcbd32217e2;hp=0dfd3834be4ff9f8178705ac523c02b209caeb9e;hpb=61869bbe7d7764ea9546996b47e488d11cf576d3;p=jalview.git diff --git a/src/jalview/analysis/AlignmentUtils.java b/src/jalview/analysis/AlignmentUtils.java index 0dfd383..f1084a7 100644 --- a/src/jalview/analysis/AlignmentUtils.java +++ b/src/jalview/analysis/AlignmentUtils.java @@ -24,7 +24,6 @@ import static jalview.io.gff.GffConstants.CLINICAL_SIGNIFICANCE; import jalview.datamodel.AlignedCodon; import jalview.datamodel.AlignedCodonFrame; -import jalview.datamodel.AlignedCodonFrame.SequenceToSequenceMapping; import jalview.datamodel.Alignment; import jalview.datamodel.AlignmentAnnotation; import jalview.datamodel.AlignmentI; @@ -36,6 +35,7 @@ import jalview.datamodel.Sequence; import jalview.datamodel.SequenceFeature; import jalview.datamodel.SequenceGroup; import jalview.datamodel.SequenceI; +import jalview.datamodel.SequenceMapping; import jalview.datamodel.features.SequenceFeatures; import jalview.io.gff.Gff3Helper; import jalview.io.gff.SequenceOntologyI; @@ -1107,7 +1107,7 @@ public class AlignmentUtils SequenceI prot = mapping.findAlignedSequence(dnaSeq, protein); if (prot != null) { - Mapping seqMap = mapping.getMappingForSequence(dnaSeq); + Mapping seqMap = mapping.getMappingForSequence(dnaSeq, false); addCodonPositions(dnaSeq, prot, protein.getGapCharacter(), seqMap, alignedCodons); unmappedProtein.remove(prot); @@ -1935,7 +1935,7 @@ public class AlignmentUtils .findMappingsForSequence(proteinProduct, mappings); for (AlignedCodonFrame acf : mappingsToPeptide) { - for (SequenceToSequenceMapping map : acf.getMappings()) + for (SequenceMapping map : acf.getMappings()) { Mapping mapping = map.getMapping(); if (mapping != aMapping @@ -2428,7 +2428,8 @@ public class AlignmentUtils static int computePeptideVariants(SequenceI peptide, int peptidePos, List[] codonVariants) { - String residue = String.valueOf(peptide.getCharAt(peptidePos - 1)); + String residue = String + .valueOf(peptide.getCharAt(peptidePos - peptide.getStart())); int count = 0; String base1 = codonVariants[0].get(0).base; String base2 = codonVariants[1].get(0).base;