Merge branch 'develop' into develop_m2_8_1_2

[jalview.git] / src / MCview / PDBfile.java

diff --git a/src/MCview/PDBfile.java b/src/MCview/PDBfile.java
index 4d9d738..829eed7 100755 (executable)
--- a/src/MCview/PDBfile.java
+++ b/src/MCview/PDBfile.java
@@ -24,6 +24,7 @@ import java.awt.*;
 
 import jalview.analysis.AlignSeq;
 import jalview.datamodel.*;
+import jalview.ext.jmol.PDBFileWithJmol;
 import jalview.io.FileParse;
 
 public class PDBfile extends jalview.io.AlignFile
@@ -158,7 +159,9 @@ public class PDBfile extends jalview.io.AlignFile
         PDBEntry entry = new PDBEntry();
         entry.setId(id);
         entry.setProperty(new Hashtable());
-        entry.getProperty().put("CHAIN", ((PDBChain)chains.elementAt(i)).id);
+        if (((PDBChain)chains.elementAt(i)).id!=null) {
+          entry.getProperty().put("CHAIN", ((PDBChain)chains.elementAt(i)).id);
+        }
         if (inFile != null)
         {
           entry.setFile(inFile.getAbsolutePath());
@@ -210,6 +213,15 @@ public class PDBfile extends jalview.io.AlignFile
         x.printStackTrace();
         
       };
+      if (prot.size()>0)
+      try {
+        processPdbFileWithJmol(prot);
+      } catch (Exception x)
+      {
+        System.err.println("Exceptions when dealing with RNA in pdb file");
+        x.printStackTrace();
+        
+      };
     } catch (OutOfMemoryError er)
     {
       System.out.println("OUT OF MEMORY LOADING PDB FILE");
@@ -225,8 +237,10 @@ public class PDBfile extends jalview.io.AlignFile
   }
   private void processPdbFileWithJmol(ArrayList<SequenceI> prot) throws Exception
   {
-    // process prot sequence with Jmol to get annotated alignment. 
-    // replaceMatchingSeqsWith(prot, al, AlignSeq.PEP);
+    PDBFileWithJmol jmf = new PDBFileWithJmol(new FileParse(getDataName(),type));
+    Alignment al = new Alignment(jmf.getSeqsAsArray());
+    jmf.addAnnotations(al);
+    replaceMatchingSeqsWith(prot, al, AlignSeq.PEP);
   }
   private void processPdbFileWithAnnotate3d(ArrayList<SequenceI> rna) throws Exception {
 //    System.out.println("this is a PDB format and RNA sequence");
@@ -295,7 +309,9 @@ public class PDBfile extends jalview.io.AlignFile
               ap++;
             }
           }
-          annotations.addAll(inspos, Arrays.asList(sq.getAnnotation()));
+          if (sq.getAnnotation()!=null) {
+            annotations.addAll(inspos, Arrays.asList(sq.getAnnotation()));
+          }
         }
       }
     }