JAL-1645 Version-Rel Version 2.9 Year-Rel 2015 Licensing glob

[jalview.git] / src / jalview / structure / StructureMapping.java

diff --git a/src/jalview/structure/StructureMapping.java b/src/jalview/structure/StructureMapping.java
index e4749c9..147cc07 100644 (file)
--- a/src/jalview/structure/StructureMapping.java
+++ b/src/jalview/structure/StructureMapping.java
@@ -1,6 +1,6 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
- * Copyright (C) 2014 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9)
+ * Copyright (C) 2015 The Jalview Authors
  * 
  * This file is part of Jalview.
  * 
@@ -64,6 +64,11 @@ public class StructureMapping
     return pdbid;
   }
 
+  /**
+   * 
+   * @param seqpos
+   * @return 0 or corresponding atom number for the sequence position
+   */
   public int getAtomNum(int seqpos)
   {
     if (mapping.length > seqpos)
@@ -76,6 +81,11 @@ public class StructureMapping
     }
   }
 
+  /**
+   * 
+   * @param seqpos
+   * @return 0 or the corresponding residue number for the sequence position
+   */
   public int getPDBResNum(int seqpos)
   {
     if (mapping.length > seqpos)
@@ -88,6 +98,11 @@ public class StructureMapping
     }
   }
 
+  /**
+   * 
+   * @param pdbResNum
+   * @return -1 or the corresponding sequence position for a pdb residue number
+   */
   public int getSeqPos(int pdbResNum)
   {
     for (int i = 0; i < mapping.length; i++)
@@ -118,7 +133,10 @@ public class StructureMapping
     {
       ds = ds.getDatasetSequence();
     }
-    ala_copy.remap(ds, mapping, 0, -1, 1);
+    // need to relocate annotation from pdb coordinates to local sequence
+    // -1,-1 doesn't look at pdbresnum but fails to remap sequence positions...
+
+    ala_copy.remap(ds, mapping, -1, -1, 0);
     ds.addAlignmentAnnotation(ala_copy);
     if (ds != sequence)
     {