X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fmc_view%2FPDBChain.java;h=2970ccf05e136b2b3a04a9d5f2a19e62c7b8ae55;hb=fb1fb73bd1e6b08de09932c98d39b847dda1cf9a;hp=035e60899ca84797b8cfd8b23c3247b9ab64b5ab;hpb=51ff7ec3b6914f3c69b35e91e69d10c88aaf5270;p=jalview.git diff --git a/src/mc_view/PDBChain.java b/src/mc_view/PDBChain.java index 035e608..2970ccf 100755 --- a/src/mc_view/PDBChain.java +++ b/src/mc_view/PDBChain.java @@ -39,6 +39,7 @@ import jalview.schemes.ResidueProperties; import jalview.structure.StructureImportSettings; import jalview.structure.StructureMapping; import jalview.util.Comparison; +import jalview.ws.datamodel.MappableContactMatrixI; public class PDBChain { @@ -82,7 +83,7 @@ public class PDBChain public String pdbid = ""; AnnotationRowBuilder tfacTemplate = new AnnotationRowBuilder( - "TemperatureFactor"); + "Temperature Factor"); public PDBChain(String thePdbid, String theId, AnnotationRowBuilder template) @@ -536,6 +537,7 @@ public class PDBChain ? tfacTemplate.getDescription() : tfacTemplate.getName()) + " for " + pdbid + id, annots, min, max, AlignmentAnnotation.LINE_GRAPH); + tfactorann.setTFType(tfacTemplate.getTFType()); tfactorann.setCalcId(getClass().getName()); tfactorann.setSequenceRef(sequence); @@ -699,9 +701,10 @@ public class PDBChain ana = new AlignmentAnnotation(ana); ana.liftOver(dsq, sqmpping); dsq.addAlignmentAnnotation(ana); - if (cm != null) + if (cm != null && cm instanceof MappableContactMatrixI) { - dsq.addContactListFor(ana, cm); + dsq.addContactListFor(ana, ((MappableContactMatrixI) cm) + .liftOver(dsq, sqmpping)); } } else @@ -716,8 +719,8 @@ public class PDBChain // Useful for debugging mappings - adds annotation for mapped position float min = -1, max = 0; Annotation[] an = new Annotation[sq.getEnd() - sq.getStart() + 1]; - for (int i = sq.getStart(), j = sq.getEnd(), - k = 0; i <= j; i++, k++) + for (int i = sq.getStart(), j = sq + .getEnd(), k = 0; i <= j; i++, k++) { int prn = mapping.getPDBResNum(k + 1);