X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2FMCview%2FPDBfile.java;h=cb3698995c4c2d708463237e56e7300118db6852;hb=ab43013b7e357b84b4abade0dba949668dfb2a0e;hp=95dec131f53c360841d1d41561a160296d43e5f0;hpb=1e5dc0e8a71d9eb0be4748f994072b11f25b04e0;p=jalview.git
diff --git a/src/MCview/PDBfile.java b/src/MCview/PDBfile.java
index 95dec13..cb36989 100755
--- a/src/MCview/PDBfile.java
+++ b/src/MCview/PDBfile.java
@@ -1,35 +1,44 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8)
- * Copyright (C) 2012 J Procter, AM Waterhouse, LM Lui, J Engelhardt, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2b1)
+ * 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.
+ * 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 .
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview. If not, see .
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
*/
package MCview;
-import java.io.*;
-import java.util.*;
-
-import java.awt.*;
-
import jalview.analysis.AlignSeq;
-import jalview.datamodel.*;
+import jalview.datamodel.Alignment;
+import jalview.datamodel.AlignmentAnnotation;
+import jalview.datamodel.AlignmentI;
+import jalview.datamodel.PDBEntry;
+import jalview.datamodel.SequenceI;
import jalview.io.FileParse;
-import jalview.ws.jws1.Annotate3D;
+import jalview.util.MessageManager;
+
+import java.awt.Color;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Hashtable;
+import java.util.List;
+import java.util.Vector;
public class PDBfile extends jalview.io.AlignFile
{
- public Vector chains;
+ public Vector chains;
public String id;
@@ -38,14 +47,39 @@ public class PDBfile extends jalview.io.AlignFile
*/
boolean VisibleChainAnnotation = false;
- public PDBfile(String inFile, String inType) throws IOException
+ boolean processSecondaryStructure = true;
+
+ boolean externalSecondaryStructure = false;
+
+ public PDBfile(boolean visibleChainAnnotation,
+ boolean processSecondaryStructure, boolean externalSecStr)
{
- super(inFile, inType);
+ super();
+ VisibleChainAnnotation = visibleChainAnnotation;
+ this.processSecondaryStructure = processSecondaryStructure;
+ this.externalSecondaryStructure = externalSecStr;
}
- public PDBfile(FileParse source) throws IOException
+ public PDBfile(boolean visibleChainAnnotation,
+ boolean processSecondaryStructure, boolean externalSecStr,
+ String file, String protocol) throws IOException
{
- super(source);
+ super(false, file, protocol);
+ VisibleChainAnnotation = visibleChainAnnotation;
+ this.processSecondaryStructure = processSecondaryStructure;
+ this.externalSecondaryStructure = externalSecStr;
+ doParse();
+ }
+
+ public PDBfile(boolean visibleChainAnnotation,
+ boolean processSecondaryStructure, boolean externalSecStr,
+ FileParse source) throws IOException
+ {
+ super(false, source);
+ VisibleChainAnnotation = visibleChainAnnotation;
+ this.processSecondaryStructure = processSecondaryStructure;
+ this.externalSecondaryStructure = externalSecStr;
+ doParse();
}
public String print()
@@ -59,7 +93,7 @@ public class PDBfile extends jalview.io.AlignFile
id = safeName(getDataName());
chains = new Vector();
- ArrayList rna=new ArrayList(), prot=new ArrayList();
+ ArrayList rna = new ArrayList(), prot = new ArrayList();
PDBChain tmpchain;
String line = null;
boolean modelFlag = false;
@@ -154,12 +188,15 @@ public class PDBfile extends jalview.io.AlignFile
}
for (int i = 0; i < chains.size(); i++)
{
- SequenceI dataset = ((PDBChain) chains.elementAt(i)).sequence;
+ SequenceI dataset = chains.elementAt(i).sequence;
dataset.setName(id + "|" + dataset.getName());
PDBEntry entry = new PDBEntry();
entry.setId(id);
entry.setProperty(new Hashtable());
- entry.getProperty().put("CHAIN", ((PDBChain)chains.elementAt(i)).id);
+ if (chains.elementAt(i).id != null)
+ {
+ entry.getProperty().put("CHAIN", chains.elementAt(i).id);
+ }
if (inFile != null)
{
entry.setFile(inFile.getAbsolutePath());
@@ -174,47 +211,62 @@ public class PDBfile extends jalview.io.AlignFile
// maintain reference to
// dataset
seqs.addElement(chainseq);
- if(isRNA(chainseq)==true)
- {
- rna.add(chainseq);
- } else {
- prot.add(chainseq);
- }
-
+ if (isRNA(chainseq) == true)
+ {
+ rna.add(chainseq);
+ }
+ else
+ {
+ prot.add(chainseq);
+ }
+
AlignmentAnnotation[] chainannot = chainseq.getAnnotation();
-
- if (chainannot != null)
+
+ if (chainannot != null && VisibleChainAnnotation)
{
for (int ai = 0; ai < chainannot.length; ai++)
{
-
chainannot[ai].visible = VisibleChainAnnotation;
annotations.addElement(chainannot[ai]);
}
}
}
- if (rna.size()>0)
- try {
- processPdbFileWithAnnotate3d(rna);
- } catch (Exception x)
+ if (processSecondaryStructure)
{
- System.err.println("Exceptions when dealing with RNA in pdb file");
- 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();
-
- };
+ if (externalSecondaryStructure && rna.size() > 0)
+ {
+ try
+ {
+ processPdbFileWithAnnotate3d(rna);
+ } catch (Exception x)
+ {
+ System.err
+ .println("Exceptions when dealing with RNA in pdb file");
+ x.printStackTrace();
+
+ }
+ }
+ ;
+ if (prot.size() > 0)
+ {
+ try
+ {
+ processPdbFileWithJmol(prot);
+ } catch (Exception x)
+ {
+ System.err
+ .println("Exceptions from Jmol when processing data in pdb file");
+ x.printStackTrace();
+
+ }
+ }
+ }
} catch (OutOfMemoryError er)
{
System.out.println("OUT OF MEMORY LOADING PDB FILE");
- throw new IOException("Out of memory loading PDB File");
+ throw new IOException(
+ MessageManager
+ .getString("exception.outofmemory_loading_pdb_file"));
} catch (NumberFormatException ex)
{
if (line != null)
@@ -223,74 +275,164 @@ public class PDBfile extends jalview.io.AlignFile
System.err.println(line);
}
}
+ markCalcIds();
+ }
+
+ private static String calcIdPrefix = "JalviewPDB";
+
+ public static boolean isCalcIdHandled(String calcId)
+ {
+ return calcId != null && (calcIdPrefix.equals(calcId));
+ }
+
+ public static boolean isCalcIdForFile(AlignmentAnnotation alan,
+ String pdbFile)
+ {
+ return alan.getCalcId() != null
+ && calcIdPrefix.equals(alan.getCalcId())
+ && pdbFile.equals(alan.getProperty("PDBID"));
}
- private void processPdbFileWithJmol(ArrayList prot) throws Exception
+
+ public static String relocateCalcId(String calcId,
+ Hashtable alreadyLoadedPDB) throws Exception
{
- // process prot sequence with Jmol to get annotated alignment.
- // replaceMatchingSeqsWith(prot, al, AlignSeq.PEP);
+ int s = calcIdPrefix.length(), end = calcId.indexOf(calcIdPrefix, s);
+ String between = calcId.substring(s, end - 1);
+ return calcIdPrefix + alreadyLoadedPDB.get(between) + ":"
+ + calcId.substring(end);
}
- private void processPdbFileWithAnnotate3d(ArrayList rna) throws Exception {
-// System.out.println("this is a PDB format and RNA sequence");
- Annotate3D an3d = new Annotate3D();
- // TODO: use the PDB ID of the structure if one is available, to save bandwidth and avoid uploading the whole structure to the service
- AlignmentI al = an3d.getRNAMLFor(new FileParse(getDataName(),type));
- replaceMatchingSeqsWith(rna, al, AlignSeq.DNA);
+
+ private void markCalcIds()
+ {
+ for (SequenceI sq : seqs)
+ {
+ if (sq.getAnnotation() != null)
+ {
+ for (AlignmentAnnotation aa : sq.getAnnotation())
+ {
+ String oldId = aa.getCalcId();
+ if (oldId == null)
+ {
+ oldId = "";
+ }
+ aa.setCalcId(calcIdPrefix);
+ aa.setProperty("PDBID", id);
+ aa.setProperty("oldCalcId", oldId);
+ }
+ }
+ }
}
- private void replaceMatchingSeqsWith(ArrayList ochains, AlignmentI al, String dnaOrProtein)
+
+ private void processPdbFileWithJmol(ArrayList prot)
+ throws Exception
{
- if (al!=null && al.getHeight()>0)
+ try
{
- ArrayList matches=new ArrayList();
- ArrayList aligns=new ArrayList();
-
- for (SequenceI sq:ochains)
+ Class cl = Class.forName("jalview.ext.jmol.PDBFileWithJmol");
+ if (cl != null)
{
- SequenceI bestm=null;
- AlignSeq bestaseq=null;
- int bestscore=0;
- for (SequenceI msq:al.getSequences())
+ Object jmf = cl.getConstructor(new Class[]
+ { FileParse.class }).newInstance(new Object[]
+ { new FileParse(getDataName(), type) });
+ Alignment al = new Alignment((SequenceI[]) cl.getMethod(
+ "getSeqsAsArray", new Class[]
+ {}).invoke(jmf));
+ cl.getMethod("addAnnotations", new Class[]
+ { Alignment.class }).invoke(jmf, al);
+ for (SequenceI sq : al.getSequences())
{
- AlignSeq aseq = AlignSeq.doGlobalNWAlignment(msq, sq, dnaOrProtein);
- if (bestm==null || aseq.getMaxScore()>bestscore)
+ if (sq.getDatasetSequence() != null)
{
- bestscore=aseq.getMaxScore();
- bestaseq= aseq;
- bestm=msq;
+ sq.getDatasetSequence().getPDBId().clear();
}
+ else
+ {
+ sq.getPDBId().clear();
+ }
+ }
+ replaceAndUpdateChains(prot, al, AlignSeq.PEP, false);
+ }
+ } catch (ClassNotFoundException q)
+ {
+ }
+ }
+
+ private void replaceAndUpdateChains(ArrayList prot,
+ AlignmentI al, String pep, boolean b)
+ {
+ List> replaced = AlignSeq
+ .replaceMatchingSeqsWith(seqs, annotations, prot, al, pep,
+ false);
+ for (PDBChain ch : chains)
+ {
+ int p = 0;
+ for (SequenceI sq : (List) replaced.get(0))
+ {
+ p++;
+ if (sq == ch.sequence || sq.getDatasetSequence() == ch.sequence)
+ {
+ p = -p;
+ break;
}
- System.out.println("Best Score for "+(matches.size()+1)+" :"+bestscore);
- matches.add(bestm);
- aligns.add(bestaseq);
- al.deleteSequence(bestm);
}
- for (int p=0,pSize=seqs.size();p rna)
+ throws Exception
+ {
+ // System.out.println("this is a PDB format and RNA sequence");
+ // note: we use reflection here so that the applet can compile and run
+ // without the HTTPClient bits and pieces needed for accessing Annotate3D
+ // web service
+ try
+ {
+ Class cl = Class.forName("jalview.ws.jws1.Annotate3D");
+ if (cl != null)
{
- SequenceI sq,sp=seqs.get(p);
- int q;
- if ((q=ochains.indexOf(sp))>-1)
+ // TODO: use the PDB ID of the structure if one is available, to save
+ // bandwidth and avoid uploading the whole structure to the service
+ Object annotate3d = cl.getConstructor(new Class[]
+ {}).newInstance(new Object[]
+ {});
+ AlignmentI al = ((AlignmentI) cl.getMethod("getRNAMLFor",
+ new Class[]
+ { FileParse.class }).invoke(annotate3d, new Object[]
+ { new FileParse(getDataName(), type) }));
+ for (SequenceI sq : al.getSequences())
{
- seqs.set(p, sq=matches.get(q));
- sq.setName(sp.getName());
- sq.setDescription(sp.getDescription());
- sq.transferAnnotation(sp, aligns.get(q).getMappingFromS1(false));
- int inspos=-1;
- for (int ap=0;ap