super(inFile, sourceType, tempfacType);
}
+ public JmolParser(FileParse fp, boolean doXferSettings) throws IOException
+ {
+ super(fp, doXferSettings);
+ }
+
public JmolParser(FileParse fp) throws IOException
{
super(fp);
@Override
public void parse() throws IOException
{
+ parse(true);
+ }
+
+ @Override
+ public void parse(boolean doXferSettings) throws IOException
+ {
setChains(new Vector<PDBChain>());
Viewer jmolModel = getJmolData();
jmolModel.openReader(getDataName(), getDataName(), getReader());
? PDBEntry.Type.MMCIF.toString()
: "PDB");
- transformJmolModelToJalview(jmolModel.ms);
+ transformJmolModelToJalview(jmolModel.ms, doXferSettings);
}
}
return false;
}
- public void transformJmolModelToJalview(ModelSet ms) throws IOException
+ public void transformJmolModelToJalview(ModelSet ms,
+ boolean localDoXferSettings) throws IOException
{
try
{
{
setId(pdbId);
setPDBIdAvailable(true);
- Console.debug("##### DATASOURCETYPE=" + getDataSourceType());
- setAlphafoldModel(alphaFold.search(pdbId) && isMMCIF
- && getDataSourceType() == DataSourceType.URL);
+ setAlphafoldModel(alphaFold.search(pdbId) && isMMCIF);
}
List<Atom> significantAtoms = convertSignificantAtoms(ms);
for (Atom tmpatom : significantAtoms)
}
lastID = tmpatom.resNumIns.trim();
}
- if (isParseImmediately())
+ if (isParseImmediately() && localDoXferSettings)
{
// configure parsing settings from the static singleton
xferSettings();
{
try
{
- Console.info("retrieving pAE for " + pdbId);
+ Console.info("Retrieving PAE for " + pdbId);
File paeFile = EBIAlfaFold.fetchAlphaFoldPAE(pdbId, null);
this.setPAEMatrix(paeFile.getAbsolutePath());
} catch (Throwable t)
}
}
// add a PAEMatrix if set (either by above or otherwise)
- Console.debug("##### hasPAEMatrix()=" + hasPAEMatrix());
- Console.debug("##### isAlphafoldModel()=" + isAlphafoldModel());
- Console.debug("##### getPAEMatrix()=" + getPAEMatrix());
if (hasPAEMatrix())
{
Alignment al = new Alignment(prot.toArray(new SequenceI[0]));
- if (isAlphafoldModel())
- {
- EBIAlfaFold.addAlphaFoldPAE(al, new File(this.getPAEMatrix()), 0,
- null, false, false);
- }
- else
- {
- EBIAlfaFold.addPAEToStructure(null, this.getInFile(),
- new File(this.getPAEMatrix()));
- }
+ EBIAlfaFold.addAlphaFoldPAE(al, new File(this.getPAEMatrix()), 0,
+ null, false, false, null);
- Console.debug("##### al.getAlignmentAnnotation()="
- + al.getAlignmentAnnotation());
if (al.getAlignmentAnnotation() != null)
{
for (AlignmentAnnotation alann : al.getAlignmentAnnotation())
{
- Console.debug("##### Adding to alann" + alann.annotationId + "("
- + alann.getCalcId() + ")");
annotations.add(alann);
}
}