JAL-629 Now showing temp fac and secondary structure for File opened structures and...

[jalview.git] / src / jalview / io / StructureFile.java

diff --git a/src/jalview/io/StructureFile.java b/src/jalview/io/StructureFile.java
index f498c1e..fb416db 100644 (file)
--- a/src/jalview/io/StructureFile.java
+++ b/src/jalview/io/StructureFile.java
@@ -23,6 +23,7 @@ package jalview.io;
 import java.awt.Color;
 import java.io.IOException;
 import java.lang.reflect.Constructor;
+import java.net.MalformedURLException;
 import java.util.List;
 import java.util.Vector;
 
@@ -36,6 +37,7 @@ import jalview.datamodel.DBRefSource;
 import jalview.datamodel.PDBEntry;
 import jalview.datamodel.PDBEntry.Type;
 import jalview.datamodel.SequenceI;
+import jalview.ext.jmol.JmolParser;
 import jalview.structure.StructureImportSettings;
 import jalview.structure.StructureImportSettings.TFType;
 import mc_view.PDBChain;
@@ -125,7 +127,13 @@ public abstract class StructureFile extends AlignFile
 
   public StructureFile(FileParse fp) throws IOException
   {
-    super(fp);
+    this(fp, true);
+  }
+
+  public StructureFile(FileParse fp, boolean doXferSettings)
+          throws IOException
+  {
+    super(fp, doXferSettings);
   }
 
   public void addSettings(boolean addAlignmentAnnotations,
@@ -138,14 +146,17 @@ public abstract class StructureFile extends AlignFile
 
   public void xferSettings()
   {
-    this.visibleChainAnnotation = StructureImportSettings
-            .isVisibleChainAnnotation();
-    this.predictSecondaryStructure = StructureImportSettings
-            .isProcessSecondaryStructure();
-    this.externalSecondaryStructure = StructureImportSettings
-            .isExternalSecondaryStructure();
-    this.temperatureFactorType = StructureImportSettings
-            .getTemperatureFactorType();
+    if (this.getDoXferSettings())
+    {
+      this.visibleChainAnnotation = StructureImportSettings
+              .isVisibleChainAnnotation();
+      this.predictSecondaryStructure = StructureImportSettings
+              .isProcessSecondaryStructure();
+      this.externalSecondaryStructure = StructureImportSettings
+              .isExternalSecondaryStructure();
+      this.temperatureFactorType = StructureImportSettings
+              .getTemperatureFactorType();
+    }
   }
 
   public StructureFile(boolean parseImmediately, Object dataObject,
@@ -338,7 +349,7 @@ public abstract class StructureFile extends AlignFile
     {
       try
       {
-        processWithJmolParser(proteinSequences);
+        processWithJmolParser(proteinSequences, true);
       } catch (Exception x)
       {
         System.err.println(
@@ -349,7 +360,8 @@ public abstract class StructureFile extends AlignFile
   }
 
   @SuppressWarnings({ "unchecked", "rawtypes" })
-  private void processWithJmolParser(List<SequenceI> prot) throws Exception
+  private void NOTprocessWithJmolParser(List<SequenceI> prot)
+          throws Exception
   {
     try
     {
@@ -395,6 +407,36 @@ public abstract class StructureFile extends AlignFile
     StructureImportSettings.setShowSeqFeatures(true);
   }
 
+  private void processWithJmolParser(List<SequenceI> prot,
+          boolean doXferSettings) throws MalformedURLException, IOException
+  {
+    FileParse fp = new FileParse(getDataName(), dataSourceType);
+
+    StructureImportSettings.setShowSeqFeatures(false);
+    StructureImportSettings.setVisibleChainAnnotation(false);
+    StructureImportSettings
+            .setProcessSecondaryStructure(predictSecondaryStructure);
+    StructureImportSettings
+            .setExternalSecondaryStructure(externalSecondaryStructure);
+    StructureImportSettings.setTemperatureFactorType(temperatureFactorType);
+    JmolParser jmf = new JmolParser(fp, doXferSettings);
+    AlignmentI al = new Alignment((SequenceI[]) jmf.getSeqsAsArray());
+    jmf.addAnnotations(al);
+    for (SequenceI sq : al.getSequences())
+    {
+      if (sq.getDatasetSequence() != null)
+      {
+        sq.getDatasetSequence().getAllPDBEntries().clear();
+      }
+      else
+      {
+        sq.getAllPDBEntries().clear();
+      }
+    }
+    replaceAndUpdateChains(prot, al, AlignSeq.PEP, false);
+    StructureImportSettings.setShowSeqFeatures(true);
+  }
+
   /**
    * Answers the first PDBChain found matching the given id, or null if none is
    * found