X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2FMCview%2FPDBChain.java;h=4703a3c623cb891e05e024d828cfd2ece0f844eb;hb=a8f483d04205bb8273ee311c12968b7e86d205fa;hp=c7eec3549a6f565ec127b5c59b98614edca08fad;hpb=eeff45e65e4454c9ebe6dbd46f7a60e0a1cfeb65;p=jalview.git

diff --git a/src/MCview/PDBChain.java b/src/MCview/PDBChain.java
index c7eec35..4703a3c 100755
--- a/src/MCview/PDBChain.java
+++ b/src/MCview/PDBChain.java
@@ -1,19 +1,20 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.6)
- * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
+ * Copyright (C) 2014 The Jalview Authors
  * 
  * This file is part of Jalview.
  * 
  * Jalview is free software: you can redistribute it and/or
  * modify it under the terms of the GNU General Public License 
  * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- * 
+ *  
  * Jalview is distributed in the hope that it will be useful, but 
  * WITHOUT ANY WARRANTY; without even the implied warranty 
  * of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
  * PURPOSE.  See the GNU General Public License for more details.
  * 
  * You should have received a copy of the GNU General Public License along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
  */
 package MCview;
 
@@ -67,6 +68,21 @@ public class PDBChain
     this.id = id;
   }
 
+  /**
+   * character used to write newlines
+   */
+  protected String newline = System.getProperty("line.separator");
+
+  public void setNewlineString(String nl)
+  {
+    newline = nl;
+  }
+
+  public String getNewlineString()
+  {
+    return newline;
+  }
+
   public String print()
   {
     String tmp = "";
@@ -75,17 +91,30 @@ public class PDBChain
     {
       tmp = tmp + ((Bond) bonds.elementAt(i)).at1.resName + " "
               + ((Bond) bonds.elementAt(i)).at1.resNumber + " " + offset
-              + "\n";
+              + newline;
     }
 
     return tmp;
   }
 
+  /**
+   * Annotate the residues with their corresponding positions in s1 using the
+   * alignment in as NOTE: This clears all atom.alignmentMapping values on the
+   * structure.
+   * 
+   * @param as
+   * @param s1
+   */
   public void makeExactMapping(AlignSeq as, SequenceI s1)
   {
     int pdbpos = as.getSeq2Start() - 2;
     int alignpos = s1.getStart() + as.getSeq1Start() - 3;
-
+    // first clear out any old alignmentMapping values:
+    for (Atom atom : (Vector<Atom>) atoms)
+    {
+      atom.alignmentMapping = -1;
+    }
+    // and now trace the alignment onto the atom set.
     for (int i = 0; i < as.astr1.length(); i++)
     {
       if (as.astr1.charAt(i) != '-')
@@ -221,6 +250,7 @@ public class PDBChain
   {
     int count = 0;
     Object symbol;
+    boolean deoxyn = false;
     boolean nucleotide = false;
     StringBuffer seq = new StringBuffer();
     Vector resFeatures = new Vector();
@@ -275,7 +305,13 @@ public class PDBChain
       if ((symbol = ResidueProperties.getAA3Hash().get(tmpat.resName)) == null)
       {
         String nucname = tmpat.resName.trim();
-        if (tmpat.name.equalsIgnoreCase("CA") || ResidueProperties.nucleotideIndex[nucname.charAt(0)] == -1)
+        // use the aaIndex rather than call 'toLower' - which would take a bit
+        // more time.
+        deoxyn = nucname.length() == 2
+                && ResidueProperties.aaIndex[nucname.charAt(0)] == ResidueProperties.aaIndex['D'];
+        if (tmpat.name.equalsIgnoreCase("CA")
+                || ResidueProperties.nucleotideIndex[nucname
+                        .charAt((deoxyn ? 1 : 0))] == -1)
         {
           seq.append("X");
           // System.err.println("PDBReader:Null aa3Hash for " +
@@ -285,7 +321,7 @@ public class PDBChain
         {
           // nucleotide flag
           nucleotide = true;
-          seq.append(nucname.charAt(0));
+          seq.append(nucname.charAt((deoxyn ? 1 : 0)));
         }
       }
       else