X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FStructureFile.java;h=7ecbc2d4da59b0d30efd86555b2c2cad3c2db091;hb=34ce5193c8766085422c32544246d92f12d0c975;hp=7392f5b80772ea5fa83b8c32a588a3cc4576f7d2;hpb=ee198b3ca3687f18a2ee186f4e7c7330f4ea30f0;p=jalview.git
diff --git a/src/jalview/io/StructureFile.java b/src/jalview/io/StructureFile.java
index 7392f5b..7ecbc2d 100644
--- a/src/jalview/io/StructureFile.java
+++ b/src/jalview/io/StructureFile.java
@@ -1,5 +1,31 @@
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ 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.
+ *
+ * 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 .
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
+ */
package jalview.io;
+import java.awt.Color;
+import java.io.IOException;
+import java.lang.reflect.Constructor;
+import java.util.List;
+import java.util.Vector;
+
import jalview.analysis.AlignSeq;
import jalview.api.FeatureSettingsModelI;
import jalview.datamodel.Alignment;
@@ -8,24 +34,17 @@ import jalview.datamodel.AlignmentI;
import jalview.datamodel.DBRefEntry;
import jalview.datamodel.DBRefSource;
import jalview.datamodel.PDBEntry;
+import jalview.datamodel.PDBEntry.Type;
import jalview.datamodel.SequenceI;
import jalview.structure.StructureImportSettings;
-
-import java.awt.Color;
-import java.io.IOException;
-import java.lang.reflect.Constructor;
-import java.util.Hashtable;
-import java.util.List;
-import java.util.Vector;
-
-import MCview.PDBChain;
+import jalview.structure.StructureImportSettings.TFType;
+import mc_view.PDBChain;
public abstract class StructureFile extends AlignFile
{
-
private String id;
- private String dbRefType;
+ private PDBEntry.Type dbRefType;
/**
* set to true to add derived sequence annotations (temp factor read from
@@ -47,10 +66,31 @@ public abstract class StructureFile extends AlignFile
private Vector chains;
- public StructureFile(String inFile, DataSourceType sourceType)
+ private boolean pdbIdAvailable;
+
+ private StructureImportSettings.TFType temperatureFactorType = TFType.DEFAULT;
+
+ public void setTemperatureFactorType(StructureImportSettings.TFType t)
+ {
+ this.temperatureFactorType = t;
+ }
+
+ public StructureImportSettings.TFType getTemperatureFactorType()
+ {
+ return temperatureFactorType;
+ }
+
+ public StructureFile(Object inFile, DataSourceType sourceType)
throws IOException
{
+ this(inFile, sourceType, null);
+ }
+
+ public StructureFile(Object inFile, DataSourceType sourceType,
+ StructureImportSettings.TFType tempfacType) throws IOException
+ {
super(inFile, sourceType);
+ this.setTemperatureFactorType(tempfacType);
}
public StructureFile(FileParse fp) throws IOException
@@ -71,13 +111,14 @@ public abstract class StructureFile extends AlignFile
this.visibleChainAnnotation = StructureImportSettings
.isVisibleChainAnnotation();
this.predictSecondaryStructure = StructureImportSettings
- .isPredictSecondaryStructure();
+ .isProcessSecondaryStructure();
this.externalSecondaryStructure = StructureImportSettings
.isExternalSecondaryStructure();
-
+ this.temperatureFactorType = StructureImportSettings
+ .getTemperatureFactorType();
}
- public StructureFile(boolean parseImmediately, String dataObject,
+ public StructureFile(boolean parseImmediately, Object dataObject,
DataSourceType sourceType) throws IOException
{
super(parseImmediately, dataObject, sourceType);
@@ -92,18 +133,17 @@ public abstract class StructureFile extends AlignFile
{
}
- @SuppressWarnings("rawtypes")
protected SequenceI postProcessChain(PDBChain chain)
{
SequenceI pdbSequence = chain.sequence;
pdbSequence.setName(getId() + "|" + pdbSequence.getName());
PDBEntry entry = new PDBEntry();
entry.setId(getId());
- entry.setType(this.dbRefType);
- entry.setProperty(new Hashtable());
+ entry.setFakedPDBId(!isPPDBIdAvailable());
+ entry.setType(getStructureFileType());
if (chain.id != null)
{
- entry.setChainCode(String.valueOf(chain.id));
+ entry.setChainCode(chain.id);
}
if (inFile != null)
{
@@ -117,9 +157,9 @@ public abstract class StructureFile extends AlignFile
DBRefEntry sourceDBRef = new DBRefEntry();
sourceDBRef.setAccessionId(getId());
sourceDBRef.setSource(DBRefSource.PDB);
- sourceDBRef.setStartRes(pdbSequence.getStart());
- sourceDBRef.setEndRes(pdbSequence.getEnd());
- pdbSequence.setSourceDBRef(sourceDBRef);
+ // TODO: specify version for 'PDB' database ref if it is read from a file.
+ // TODO: decide if jalview.io should be creating primary refs!
+ sourceDBRef.setVersion("");
pdbSequence.addPDBId(entry);
pdbSequence.addDBRef(sourceDBRef);
SequenceI chainseq = pdbSequence;
@@ -137,6 +177,26 @@ public abstract class StructureFile extends AlignFile
return chainseq;
}
+ /**
+ * filetype of structure file - default is PDB
+ */
+ String structureFileType = PDBEntry.Type.PDB.toString();
+
+ protected void setStructureFileType(String structureFileType)
+ {
+ this.structureFileType = structureFileType;
+ }
+
+ /**
+ * filetype of last file processed
+ *
+ * @return
+ */
+ public String getStructureFileType()
+ {
+ return structureFileType;
+ }
+
@SuppressWarnings({ "unchecked", "rawtypes" })
protected void processPdbFileWithAnnotate3d(List rna)
throws Exception
@@ -152,11 +212,13 @@ public abstract class StructureFile extends AlignFile
{
// 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(), dataSourceType) }));
+ 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(), dataSourceType) }));
for (SequenceI sq : al.getSequences())
{
if (sq.getDatasetSequence() != null)
@@ -183,8 +245,8 @@ public abstract class StructureFile extends AlignFile
}
@SuppressWarnings("unchecked")
- protected void replaceAndUpdateChains(List prot,
- AlignmentI al, String pep, boolean b)
+ protected void replaceAndUpdateChains(List prot, AlignmentI al,
+ String pep, boolean b)
{
List> replaced = AlignSeq
.replaceMatchingSeqsWith(seqs, annotations, prot, al, pep,
@@ -249,8 +311,8 @@ public abstract class StructureFile extends AlignFile
processWithJmolParser(proteinSequences);
} catch (Exception x)
{
- System.err
- .println("Exceptions from Jmol when processing data in pdb file");
+ System.err.println(
+ "Exceptions from Jmol when processing data in pdb file");
x.printStackTrace();
}
}
@@ -265,21 +327,21 @@ public abstract class StructureFile extends AlignFile
Class cl = Class.forName("jalview.ext.jmol.JmolParser");
if (cl != null)
{
- final Constructor constructor = cl.getConstructor(new Class[] {
- boolean.class, boolean.class, boolean.class, FileParse.class });
- final Object[] args = new Object[] { visibleChainAnnotation,
- predictSecondaryStructure, externalSecondaryStructure,
+ final Constructor constructor = cl
+ .getConstructor(new Class[]
+ { FileParse.class });
+ final Object[] args = new Object[] {
new FileParse(getDataName(), dataSourceType) };
StructureImportSettings.setShowSeqFeatures(false);
StructureImportSettings.setVisibleChainAnnotation(false);
StructureImportSettings
- .setPredictSecondaryStructure(predictSecondaryStructure);
+ .setProcessSecondaryStructure(predictSecondaryStructure);
StructureImportSettings
.setExternalSecondaryStructure(externalSecondaryStructure);
Object jmf = constructor.newInstance(args);
- AlignmentI al = new Alignment((SequenceI[]) cl.getMethod(
- "getSeqsAsArray", new Class[] {}).invoke(jmf));
+ AlignmentI al = new Alignment((SequenceI[]) cl
+ .getMethod("getSeqsAsArray", new Class[] {}).invoke(jmf));
cl.getMethod("addAnnotations", new Class[] { AlignmentI.class })
.invoke(jmf, al);
for (SequenceI sq : al.getSequences())
@@ -301,16 +363,23 @@ public abstract class StructureFile extends AlignFile
StructureImportSettings.setShowSeqFeatures(true);
}
- public PDBChain findChain(String id) throws Exception
+ /**
+ * Answers the first PDBChain found matching the given id, or null if none is
+ * found
+ *
+ * @param id
+ * @return
+ */
+ public PDBChain findChain(String id)
{
for (PDBChain chain : getChains())
{
- if (chain.id.equalsIgnoreCase(id))
+ if (chain.id.equals(id))
{
return chain;
}
}
- throw new Exception("PDB chain not Found!");
+ return null;
}
public void makeResidueList()
@@ -356,8 +425,10 @@ public abstract class StructureFile extends AlignFile
public static boolean isRNA(SequenceI seq)
{
- for (char c : seq.getSequence())
+ int length = seq.getLength();
+ for (int i = 0; i < length; i++)
{
+ char c = seq.getCharAt(i);
if ((c != 'A') && (c != 'C') && (c != 'G') && (c != 'U'))
{
return false;
@@ -370,7 +441,8 @@ public abstract class StructureFile extends AlignFile
* make a friendly ID string.
*
* @param dataName
- * @return truncated dataName to after last '/'
+ * @return truncated dataName to after last '/' and pruned .extension if
+ * present
*/
protected String safeName(String dataName)
{
@@ -379,6 +451,10 @@ public abstract class StructureFile extends AlignFile
{
dataName = dataName.substring(p + 1);
}
+ if (dataName.indexOf(".") > -1)
+ {
+ dataName = dataName.substring(0, dataName.lastIndexOf("."));
+ }
return dataName;
}
@@ -402,13 +478,18 @@ public abstract class StructureFile extends AlignFile
this.chains = chains;
}
- public String getDbRefType()
+ public Type getDbRefType()
{
return dbRefType;
}
public void setDbRefType(String dbRefType)
{
+ this.dbRefType = Type.getType(dbRefType);
+ }
+
+ public void setDbRefType(Type dbRefType)
+ {
this.dbRefType = dbRefType;
}
@@ -426,4 +507,19 @@ public abstract class StructureFile extends AlignFile
{
return new PDBFeatureSettings();
}
+
+ /**
+ * Answers true if the structure file has a PDBId
+ *
+ * @return
+ */
+ public boolean isPPDBIdAvailable()
+ {
+ return pdbIdAvailable;
+ }
+
+ public void setPDBIdAvailable(boolean pdbIdAvailable)
+ {
+ this.pdbIdAvailable = pdbIdAvailable;
+ }
}