X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2FMCview%2FPDBfile.java;h=cb3698995c4c2d708463237e56e7300118db6852;hb=ab43013b7e357b84b4abade0dba949668dfb2a0e;hp=20b3171350436becc0796b1b0f591a1e50888691;hpb=c02741faf92c295a59d36e0422c1791aa74ef025;p=jalview.git diff --git a/src/MCview/PDBfile.java b/src/MCview/PDBfile.java index 20b3171..cb36989 100755 --- a/src/MCview/PDBfile.java +++ b/src/MCview/PDBfile.java @@ -1,5 +1,5 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2) + * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2b1) * Copyright (C) 2014 The Jalview Authors * * This file is part of Jalview. @@ -33,11 +33,12 @@ 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; @@ -46,32 +47,38 @@ public class PDBfile extends jalview.io.AlignFile */ boolean VisibleChainAnnotation = false; - boolean processSecondaryStructure=true; - + boolean processSecondaryStructure = true; + + boolean externalSecondaryStructure = false; public PDBfile(boolean visibleChainAnnotation, - boolean processSecondaryStructure) + boolean processSecondaryStructure, boolean externalSecStr) { super(); VisibleChainAnnotation = visibleChainAnnotation; this.processSecondaryStructure = processSecondaryStructure; + this.externalSecondaryStructure = externalSecStr; } public PDBfile(boolean visibleChainAnnotation, - boolean processSecondaryStructure, String file, String protocol) throws IOException + boolean processSecondaryStructure, boolean externalSecStr, + String file, String protocol) throws IOException { super(false, file, protocol); VisibleChainAnnotation = visibleChainAnnotation; this.processSecondaryStructure = processSecondaryStructure; + this.externalSecondaryStructure = externalSecStr; doParse(); } public PDBfile(boolean visibleChainAnnotation, - boolean processSecondaryStructure, FileParse source) throws IOException + boolean processSecondaryStructure, boolean externalSecStr, + FileParse source) throws IOException { super(false, source); VisibleChainAnnotation = visibleChainAnnotation; this.processSecondaryStructure = processSecondaryStructure; + this.externalSecondaryStructure = externalSecStr; doParse(); } @@ -181,15 +188,14 @@ 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()); - if (((PDBChain) chains.elementAt(i)).id != null) + if (chains.elementAt(i).id != null) { - entry.getProperty().put("CHAIN", - ((PDBChain) chains.elementAt(i)).id); + entry.getProperty().put("CHAIN", chains.elementAt(i).id); } if (inFile != null) { @@ -216,7 +222,7 @@ public class PDBfile extends jalview.io.AlignFile AlignmentAnnotation[] chainannot = chainseq.getAnnotation(); - if (chainannot != null) + if (chainannot != null && VisibleChainAnnotation) { for (int ai = 0; ai < chainannot.length; ai++) { @@ -227,34 +233,34 @@ public class PDBfile extends jalview.io.AlignFile } if (processSecondaryStructure) { - if (rna.size() > 0) - { - try + if (externalSecondaryStructure && rna.size() > 0) { - processPdbFileWithAnnotate3d(rna); - } catch (Exception x) - { - System.err - .println("Exceptions when dealing with RNA in pdb file"); - x.printStackTrace(); + try + { + processPdbFileWithAnnotate3d(rna); + } catch (Exception x) + { + System.err + .println("Exceptions when dealing with RNA in pdb file"); + x.printStackTrace(); + } } - } - ; - if (prot.size() > 0) - { - try + ; + if (prot.size() > 0) { - processPdbFileWithJmol(prot); - } catch (Exception x) - { - System.err - .println("Exceptions from Jmol when processing data in pdb file"); - x.printStackTrace(); + 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"); @@ -269,6 +275,52 @@ 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")); + } + + public static String relocateCalcId(String calcId, + Hashtable alreadyLoadedPDB) throws Exception + { + 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 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 processPdbFileWithJmol(ArrayList prot) @@ -287,13 +339,53 @@ public class PDBfile extends jalview.io.AlignFile {}).invoke(jmf)); cl.getMethod("addAnnotations", new Class[] { Alignment.class }).invoke(jmf, al); - AlignSeq.replaceMatchingSeqsWith(seqs, annotations, prot, al, AlignSeq.PEP, false); + for (SequenceI sq : al.getSequences()) + { + if (sq.getDatasetSequence() != null) + { + 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; + } + } + if (p < 0) + { + p = -p - 1; + // set shadow entry for chains + ch.shadow = (SequenceI) replaced.get(1).get(p); + ch.shadowMap = ((AlignSeq) replaced.get(2).get(p)) + .getMappingFromS1(false); + } + } + } + private void processPdbFileWithAnnotate3d(ArrayList rna) throws Exception { @@ -315,7 +407,24 @@ public class PDBfile extends jalview.io.AlignFile new Class[] { FileParse.class }).invoke(annotate3d, new Object[] { new FileParse(getDataName(), type) })); - AlignSeq.replaceMatchingSeqsWith(seqs, annotations, rna, al, AlignSeq.DNA, false); + for (SequenceI sq : al.getSequences()) + { + if (sq.getDatasetSequence() != null) + { + if (sq.getDatasetSequence().getPDBId() != null) + { + sq.getDatasetSequence().getPDBId().clear(); + } + } + else + { + if (sq.getPDBId() != null) + { + sq.getPDBId().clear(); + } + } + } + replaceAndUpdateChains(rna, al, AlignSeq.DNA, false); } } catch (ClassNotFoundException x) { @@ -344,7 +453,7 @@ public class PDBfile extends jalview.io.AlignFile { for (int i = 0; i < chains.size(); i++) { - ((PDBChain) chains.elementAt(i)).makeResidueList(); + chains.elementAt(i).makeResidueList(VisibleChainAnnotation); } } @@ -352,7 +461,7 @@ public class PDBfile extends jalview.io.AlignFile { for (int i = 0; i < chains.size(); i++) { - ((PDBChain) chains.elementAt(i)).makeCaBondList(); + chains.elementAt(i).makeCaBondList(); } } @@ -360,9 +469,9 @@ public class PDBfile extends jalview.io.AlignFile { for (int i = 0; i < chains.size(); i++) { - if (((PDBChain) chains.elementAt(i)).id.equals(id)) + if (chains.elementAt(i).id.equals(id)) { - return (PDBChain) chains.elementAt(i); + return chains.elementAt(i); } } @@ -373,7 +482,7 @@ public class PDBfile extends jalview.io.AlignFile { for (int i = 0; i < chains.size(); i++) { - ((PDBChain) chains.elementAt(i)).setChargeColours(); + chains.elementAt(i).setChargeColours(); } } @@ -381,7 +490,7 @@ public class PDBfile extends jalview.io.AlignFile { for (int i = 0; i < chains.size(); i++) { - ((PDBChain) chains.elementAt(i)).setChainColours(cs); + chains.elementAt(i).setChainColours(cs); } } @@ -389,8 +498,8 @@ public class PDBfile extends jalview.io.AlignFile { for (int i = 0; i < chains.size(); i++) { - ((PDBChain) chains.elementAt(i)).setChainColours(Color.getHSBColor( - 1.0f / i, .4f, 1.0f)); + chains.elementAt(i).setChainColours( + Color.getHSBColor(1.0f / i, .4f, 1.0f)); } }