X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2FMCview%2FPDBfile.java;h=3df320c553571ebc6cf6a33dcb2bd8dc3660211e;hb=2a198f35d10d35bd4c3eef1b0f5e623252bfa564;hp=227bcf7da2f992929adbc3b219873674c838434c;hpb=c11ccf600bdcfa62302eeeb4898ff431eea6de14;p=jalview.git

diff --git a/src/MCview/PDBfile.java b/src/MCview/PDBfile.java
index 227bcf7..3df320c 100755
--- a/src/MCview/PDBfile.java
+++ b/src/MCview/PDBfile.java
@@ -1,17 +1,17 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer
- * Copyright (C) 2007 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
- *
+ * Jalview - A Sequence Alignment Editor and Viewer (Development Version 2.4.1)
+ * Copyright (C) 2009 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
+ * 
  * This program 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 2
  * of the License, or (at your option) any later version.
- *
+ * 
  * This program 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 this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
@@ -24,31 +24,38 @@ import java.util.*;
 import java.awt.*;
 
 import jalview.datamodel.*;
+import jalview.io.FileParse;
 
-public class PDBfile
-    extends jalview.io.AlignFile
+public class PDBfile extends jalview.io.AlignFile
 {
   public Vector chains;
+
   public String id;
 
   /**
    * set to true to add chain alignment annotation as visible annotation.
    */
-  boolean VisibleChainAnnotation=false;
-  public PDBfile(String inFile, String inType)
-      throws IOException
+  boolean VisibleChainAnnotation = false;
+
+  public PDBfile(String inFile, String inType) throws IOException
   {
     super(inFile, inType);
   }
 
+  public PDBfile(FileParse source) throws IOException
+  {
+    super(source);
+  }
+
   public String print()
   {
     return null;
   }
 
-  public void parse()
-      throws IOException
+  public void parse() throws IOException
   {
+    // TODO set the filename sensibly
+    id = (inFile == null || inFile.getName()==null || inFile.getName().length()==0) ? "PDBFILE" : inFile.getName();
     try
     {
       chains = new Vector();
@@ -57,14 +64,28 @@ public class PDBfile
       String line;
       boolean modelFlag = false;
       boolean terFlag = false;
+      String lastID="";
 
       int index = 0;
-      while ( (line = nextLine()) != null)
+      String atomnam=null;
+      while ((line = nextLine()) != null)
       {
         if (line.indexOf("HEADER") == 0)
         {
-          id = line.substring(62, 67).trim();
-          continue;
+          if (line.length()>62)
+          {
+            String tid;
+            if (line.length()>67) {
+              tid = line.substring(62, 67).trim();
+            } else {
+              tid=line.substring(62).trim();
+            }
+            if (tid.length()>0)
+            {
+              id = tid;
+            }
+            continue;
+          }
         }
         // Were we to do anything with SEQRES - we start it here
         if (line.indexOf("SEQRES") == 0)
@@ -86,13 +107,13 @@ public class PDBfile
           break;
         }
         if (line.indexOf("ATOM") == 0
-            || (line.indexOf("HETATM") == 0 && !terFlag)
-            )
+                || (line.indexOf("HETATM") == 0 && !terFlag))
         {
           terFlag = false;
 
-          //Jalview is only interested in CA bonds????
-          if (!line.substring(12, 15).trim().equals("CA"))
+          // Jalview is only interested in CA bonds????
+          atomnam = line.substring(12, 15).trim();
+          if (!atomnam.equals("CA") && !atomnam.equals("P"))
           {
             continue;
           }
@@ -101,6 +122,11 @@ public class PDBfile
           tmpchain = findChain(tmpatom.chain);
           if (tmpchain != null)
           {
+            if (tmpatom.resNumIns.trim().equals(lastID))
+            {
+              //  phosphorylated protein - seen both CA and P..
+              continue;
+            }
             tmpchain.atoms.addElement(tmpatom);
           }
           else
@@ -109,6 +135,7 @@ public class PDBfile
             chains.addElement(tmpchain);
             tmpchain.atoms.addElement(tmpatom);
           }
+          lastID = tmpatom.resNumIns.trim();
         }
         index++;
       }
@@ -122,8 +149,7 @@ public class PDBfile
       }
       for (int i = 0; i < chains.size(); i++)
       {
-        SequenceI dataset = ( (PDBChain) chains.elementAt(i)).
-            sequence;
+        SequenceI dataset = ((PDBChain) chains.elementAt(i)).sequence;
         dataset.setName(id + "|" + dataset.getName());
         PDBEntry entry = new PDBEntry();
         entry.setId(id);
@@ -132,20 +158,21 @@ public class PDBfile
           entry.setFile(inFile.getAbsolutePath());
         }
         dataset.addPDBId(entry);
-        SequenceI chainseq = dataset.deriveSequence(); // PDBChain objects maintain reference to dataset
+        SequenceI chainseq = dataset.deriveSequence(); // PDBChain objects
+                                                        // maintain reference to
+                                                        // dataset
         seqs.addElement(chainseq);
         AlignmentAnnotation[] chainannot = chainseq.getAnnotation();
-        if (chainannot!=null)
+        if (chainannot != null)
         {
-          for (int ai=0; ai<chainannot.length; ai++)
+          for (int ai = 0; ai < chainannot.length; ai++)
           {
-            chainannot[ai].visible=VisibleChainAnnotation;
+            chainannot[ai].visible = VisibleChainAnnotation;
             annotations.addElement(chainannot[ai]);
           }
         }
       }
-    }
-    catch (OutOfMemoryError er)
+    } catch (OutOfMemoryError er)
     {
       System.out.println("OUT OF MEMORY LOADING PDB FILE");
       throw new IOException("Out of memory loading PDB File");
@@ -156,7 +183,7 @@ public class PDBfile
   {
     for (int i = 0; i < chains.size(); i++)
     {
-      ( (PDBChain) chains.elementAt(i)).makeResidueList();
+      ((PDBChain) chains.elementAt(i)).makeResidueList();
     }
   }
 
@@ -164,7 +191,7 @@ public class PDBfile
   {
     for (int i = 0; i < chains.size(); i++)
     {
-      ( (PDBChain) chains.elementAt(i)).makeCaBondList();
+      ((PDBChain) chains.elementAt(i)).makeCaBondList();
     }
   }
 
@@ -172,7 +199,7 @@ public class PDBfile
   {
     for (int i = 0; i < chains.size(); i++)
     {
-      if ( ( (PDBChain) chains.elementAt(i)).id.equals(id))
+      if (((PDBChain) chains.elementAt(i)).id.equals(id))
       {
         return (PDBChain) chains.elementAt(i);
       }
@@ -185,7 +212,7 @@ public class PDBfile
   {
     for (int i = 0; i < chains.size(); i++)
     {
-      ( (PDBChain) chains.elementAt(i)).setChargeColours();
+      ((PDBChain) chains.elementAt(i)).setChargeColours();
     }
   }
 
@@ -193,7 +220,7 @@ public class PDBfile
   {
     for (int i = 0; i < chains.size(); i++)
     {
-      ( (PDBChain) chains.elementAt(i)).setChainColours(cs);
+      ((PDBChain) chains.elementAt(i)).setChainColours(cs);
     }
   }
 
@@ -201,9 +228,8 @@ public class PDBfile
   {
     for (int i = 0; i < chains.size(); i++)
     {
-      ( (PDBChain) chains.elementAt(i)).setChainColours(
-          Color.getHSBColor(1.0f / (float) i, .4f, 1.0f)
-          );
+      ((PDBChain) chains.elementAt(i)).setChainColours(Color.getHSBColor(
+              1.0f / (float) i, .4f, 1.0f));
     }
   }
 }