X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2FMCview%2FPDBChain.java;fp=src%2FMCview%2FPDBChain.java;h=ba93046f0a3467e670725a67398d6d8e7b48b656;hb=2595e9d4ee0dbbd3406a98c4e49a61ccde806479;hp=7774dac96936327b49508ff203e98a6c9d3c9e71;hpb=e20075ba805d744d7cc4976e2b8d5e5840fb0a8d;p=jalview.git diff --git a/src/MCview/PDBChain.java b/src/MCview/PDBChain.java index 7774dac..ba93046 100755 --- a/src/MCview/PDBChain.java +++ b/src/MCview/PDBChain.java @@ -31,6 +31,7 @@ import jalview.schemes.ColourSchemeI; import jalview.schemes.ResidueProperties; import jalview.structure.StructureImportSettings; import jalview.structure.StructureMapping; +import jalview.util.Comparison; import java.awt.Color; import java.util.List; @@ -38,6 +39,8 @@ import java.util.Vector; public class PDBChain { + public static final String RESNUM_FEATURE = "RESNUM"; + /** * SequenceFeature group for PDB File features added to sequences */ @@ -146,7 +149,9 @@ public class PDBChain pdbpos++; } - if (as.astr1.charAt(i) == as.astr2.charAt(i)) + boolean sameResidue = Comparison.isSameResidue(as.astr1.charAt(i), + as.astr2.charAt(i), false); + if (sameResidue) { if (pdbpos >= residues.size()) { @@ -364,7 +369,7 @@ public class PDBChain Residue tmpres = residues.lastElement(); Atom tmpat = tmpres.atoms.get(0); // Make A new SequenceFeature for the current residue numbering - SequenceFeature sf = new SequenceFeature("RESNUM", tmpat.resName + SequenceFeature sf = new SequenceFeature(RESNUM_FEATURE, tmpat.resName + ":" + tmpat.resNumIns + " " + pdbid + id, "", offset + count, offset + count, pdbid); resFeatures.addElement(sf); @@ -513,10 +518,12 @@ public class PDBChain try { index = ResidueProperties.aa3Hash.get(b.at1.resName).intValue(); - b.startCol = cs.findColour(ResidueProperties.aa[index].charAt(0)); + b.startCol = cs.findColour(ResidueProperties.aa[index].charAt(0), + 0, null, null, 0f); index = ResidueProperties.aa3Hash.get(b.at2.resName).intValue(); - b.endCol = cs.findColour(ResidueProperties.aa[index].charAt(0)); + b.endCol = cs.findColour(ResidueProperties.aa[index].charAt(0), 0, + null, null, 0f); } catch (Exception e) {