X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fstructures%2Fmodels%2FAAStructureBindingModel.java;h=7d578869b93fb697a661df4320095243ae040553;hb=799c26111d6936a2e70cb5f1fd7d7312311e6db9;hp=cea6b0ec13c5aa8e3dcbb377bf11ae6049be105d;hpb=c19d2a91ca05e052e3408bf5852d88eb5d0608f1;p=jalview.git diff --git a/src/jalview/structures/models/AAStructureBindingModel.java b/src/jalview/structures/models/AAStructureBindingModel.java index cea6b0e..7d57886 100644 --- a/src/jalview/structures/models/AAStructureBindingModel.java +++ b/src/jalview/structures/models/AAStructureBindingModel.java @@ -1,6 +1,6 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9.0b2) - * Copyright (C) 2015 The Jalview Authors + * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$) + * Copyright (C) $$Year-Rel$$ The Jalview Authors * * This file is part of Jalview. * @@ -20,19 +20,30 @@ */ package jalview.structures.models; +import jalview.api.AlignViewportI; +import jalview.api.AlignmentViewPanel; +import jalview.api.FeatureRenderer; +import jalview.api.SequenceRenderer; import jalview.api.StructureSelectionManagerProvider; +import jalview.api.structures.JalviewStructureDisplayI; import jalview.datamodel.AlignmentI; +import jalview.datamodel.ColumnSelection; import jalview.datamodel.PDBEntry; import jalview.datamodel.SequenceI; +import jalview.io.DataSourceType; +import jalview.schemes.ColourSchemeI; import jalview.structure.AtomSpec; import jalview.structure.StructureListener; import jalview.structure.StructureMapping; +import jalview.structure.StructureMappingcommandSet; import jalview.structure.StructureSelectionManager; import jalview.util.Comparison; import jalview.util.MessageManager; +import java.awt.Color; import java.util.ArrayList; import java.util.Arrays; +import java.util.BitSet; import java.util.List; /** @@ -51,6 +62,10 @@ public abstract class AAStructureBindingModel extends private StructureSelectionManager ssm; + /* + * distinct PDB entries (pdb files) associated + * with sequences + */ private PDBEntry[] pdbEntry; /* @@ -66,7 +81,7 @@ public abstract class AAStructureBindingModel extends /* * datasource protocol for access to PDBEntrylatest */ - String protocol = null; + DataSourceType protocol = null; protected boolean colourBySequence = true; @@ -75,6 +90,13 @@ public abstract class AAStructureBindingModel extends private boolean finishedInit = false; /** + * current set of model filenames loaded in the Jmol instance + */ + protected String[] modelFileNames = null; + + public String fileLoadingError; + + /** * Data bean class to simplify parameterisation in superposeStructures */ protected class SuperposeData @@ -126,19 +148,14 @@ public abstract class AAStructureBindingModel extends * @param protocol */ public AAStructureBindingModel(StructureSelectionManager ssm, - PDBEntry[] pdbentry, SequenceI[][] sequenceIs, String[][] chains, - String protocol) + PDBEntry[] pdbentry, SequenceI[][] sequenceIs, + DataSourceType protocol) { this.ssm = ssm; this.sequence = sequenceIs; this.nucleotide = Comparison.isNucleotide(sequenceIs); - this.chains = chains; this.pdbEntry = pdbentry; this.protocol = protocol; - if (chains == null) - { - this.chains = new String[pdbentry.length][]; - } } public StructureSelectionManager getSsm() @@ -198,7 +215,7 @@ public abstract class AAStructureBindingModel extends return chains; } - public String getProtocol() + public DataSourceType getProtocol() { return protocol; } @@ -239,24 +256,21 @@ public abstract class AAStructureBindingModel extends // TODO: give a more informative title when multiple structures are // displayed. StringBuilder title = new StringBuilder(64); - final PDBEntry pdbEntry = getPdbEntry(0); + final PDBEntry pdbe = getPdbEntry(0); title.append(viewerName + " view for " + getSequence()[0][0].getName() - + ":" + pdbEntry.getId()); + + ":" + pdbe.getId()); if (verbose) { - if (pdbEntry.getProperty() != null) + String method = (String) pdbe.getProperty("method"); + if (method != null) { - if (pdbEntry.getProperty().get("method") != null) - { - title.append(" Method: "); - title.append(pdbEntry.getProperty().get("method")); - } - if (pdbEntry.getProperty().get("chains") != null) - { - title.append(" Chain:"); - title.append(pdbEntry.getProperty().get("chains")); - } + title.append(" Method: ").append(method); + } + String chain = (String) pdbe.getProperty("chains"); + if (chain != null) + { + title.append(" Chain:").append(chain); } } return title.toString(); @@ -509,18 +523,22 @@ public abstract class AAStructureBindingModel extends * the sequence alignment which is the basis of structure * superposition * @param matched - * an array of booleans, indexed by alignment column, where true - * indicates that every structure has a mapped residue present in the - * column (so the column can participate in structure alignment) + * a BitSet, where bit j is set to indicate that every structure has + * a mapped residue present in column j (so the column can + * participate in structure alignment) * @param structures * an array of data beans corresponding to pdb file index * @return */ protected int findSuperposableResidues(AlignmentI alignment, - boolean[] matched, SuperposeData[] structures) + BitSet matched, SuperposeData[] structures) { int refStructure = -1; String[] files = getPdbFile(); + if (files == null) + { + return -1; + } for (int pdbfnum = 0; pdbfnum < files.length; pdbfnum++) { StructureMapping[] mappings = getSsm().getMapping(files[pdbfnum]); @@ -543,16 +561,16 @@ public abstract class AAStructureBindingModel extends { refStructure = pdbfnum; } - for (int r = 0; r < matched.length; r++) + for (int r = 0; r < alignment.getWidth(); r++) { - if (!matched[r]) + if (!matched.get(r)) { continue; } int pos = getMappedPosition(theSequence, r, mapping); if (pos < 1 || pos == lastPos) { - matched[r] = false; + matched.clear(r); continue; } lastPos = pos; @@ -565,7 +583,11 @@ public abstract class AAStructureBindingModel extends } structures[pdbfnum].pdbId = mapping.getPdbId(); structures[pdbfnum].isRna = theSequence.getRNA() != null; - // move on to next pdb file + + /* + * move on to next pdb file (ignore sequences for other chains + * for the same structure) + */ s = seqCountForPdbFile; break; } @@ -598,6 +620,10 @@ public abstract class AAStructureBindingModel extends for (String file : files) { notLoaded = file; + if (file == null) + { + continue; + } try { StructureMapping[] sm = getSsm().getMapping(file); @@ -633,7 +659,10 @@ public abstract class AAStructureBindingModel extends { for (SequenceI s : seqs) { - if (s == seq) + if (s == seq + || (s.getDatasetSequence() != null && s + .getDatasetSequence() == seq + .getDatasetSequence())) { return true; } @@ -653,4 +682,112 @@ public abstract class AAStructureBindingModel extends { this.finishedInit = fi; } + + /** + * Returns a list of chains mapped in this viewer. + * + * @return + */ + public abstract List getChainNames(); + + /** + * Returns the Jalview panel hosting the structure viewer (if any) + * + * @return + */ + public JalviewStructureDisplayI getViewer() + { + return null; + } + + public abstract void setJalviewColourScheme(ColourSchemeI cs); + + /** + * Constructs and sends a command to align structures against a reference + * structure, based on one or more sequence alignments. May optionally return + * an error or warning message for the alignment command. + * + * @param alignments + * an array of alignments to process + * @param structureIndices + * an array of corresponding reference structures (index into pdb + * file array); if a negative value is passed, the first PDB file + * mapped to an alignment sequence is used as the reference for + * superposition + * @param hiddenCols + * an array of corresponding hidden columns for each alignment + * @return + */ + public abstract String superposeStructures(AlignmentI[] alignments, int[] structureIndices, + ColumnSelection[] hiddenCols); + + public abstract void setBackgroundColour(Color col); + + protected abstract StructureMappingcommandSet[] getColourBySequenceCommands( + String[] files, SequenceRenderer sr, FeatureRenderer fr, + AlignViewportI alignViewportI); + + /** + * returns the current featureRenderer that should be used to colour the + * structures + * + * @param alignment + * + * @return + */ + public abstract FeatureRenderer getFeatureRenderer(AlignmentViewPanel alignment); + + /** + * returns the current sequenceRenderer that should be used to colour the + * structures + * + * @param alignment + * + * @return + */ + public abstract SequenceRenderer getSequenceRenderer(AlignmentViewPanel alignment); + + protected abstract void colourBySequence( + StructureMappingcommandSet[] colourBySequenceCommands); + + public abstract void colourByChain(); + + public abstract void colourByCharge(); + + /** + * colour any structures associated with sequences in the given alignment + * using the getFeatureRenderer() and getSequenceRenderer() renderers but only + * if colourBySequence is enabled. + */ + public void colourBySequence(AlignmentViewPanel alignmentv) + { + if (!colourBySequence || !isLoadingFinished()) + { + return; + } + if (getSsm() == null) + { + return; + } + String[] files = getPdbFile(); + + SequenceRenderer sr = getSequenceRenderer(alignmentv); + + FeatureRenderer fr = null; + boolean showFeatures = alignmentv.getAlignViewport() + .isShowSequenceFeatures(); + if (showFeatures) + { + fr = getFeatureRenderer(alignmentv); + } + + StructureMappingcommandSet[] colourBySequenceCommands = getColourBySequenceCommands( + files, sr, fr, alignmentv.getAlignViewport()); + colourBySequence(colourBySequenceCommands); + } + + public boolean hasFileLoadingError() + { + return fileLoadingError != null && fileLoadingError.length() > 0; + } }