X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fstructure%2FStructureSelectionManager.java;h=449e13351bd655c766890e0370cd2cb39e9ddc0b;hb=c2a1cd8c85ca44529a5fb0d5dd941aa4dcdc09ed;hp=502c68e35b1cb0e8e9f1ed2e6e3076a006b7128f;hpb=245a1b805629bedf7a0d66aecb26de6bc220b991;p=jalview.git diff --git a/src/jalview/structure/StructureSelectionManager.java b/src/jalview/structure/StructureSelectionManager.java index 502c68e..449e133 100644 --- a/src/jalview/structure/StructureSelectionManager.java +++ b/src/jalview/structure/StructureSelectionManager.java @@ -1,59 +1,140 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.6) - * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle + * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2) + * 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 jalview.structure; -import java.io.*; -import java.util.*; - -import MCview.*; -import jalview.analysis.*; -import jalview.datamodel.*; +import jalview.analysis.AlignSeq; +import jalview.api.StructureSelectionManagerProvider; +import jalview.datamodel.AlignedCodonFrame; +import jalview.datamodel.AlignmentAnnotation; +import jalview.datamodel.Annotation; +import jalview.datamodel.PDBEntry; +import jalview.datamodel.SearchResults; +import jalview.datamodel.SequenceI; +import jalview.io.FormatAdapter; +import jalview.util.MessageManager; + +import java.io.PrintStream; +import java.util.Enumeration; +import java.util.HashMap; +import java.util.IdentityHashMap; +import java.util.Vector; + +import MCview.Atom; +import MCview.PDBChain; public class StructureSelectionManager { - static StructureSelectionManager instance; + static IdentityHashMap instances; StructureMapping[] mappings; /** * debug function - write all mappings to stdout */ - public void reportMapping() { - if (mappings==null) - { - System.err.println("reportMapping: No PDB/Sequence mappings."); - }else{ - System.err.println("reportMapping: There are "+mappings.length+" mappings."); - for (int m=0;m pdbIdFileName = new HashMap(), + pdbFileNameId = new HashMap(); + + public void registerPDBFile(String idForFile, String absoluteFile) + { + pdbIdFileName.put(idForFile, absoluteFile); + pdbFileNameId.put(absoluteFile, idForFile); + } + + public String findIdForPDBFile(String idOrFile) + { + String id = pdbFileNameId.get(idOrFile); + return id; + } + + public String findFileForPDBId(String idOrFile) + { + String id = pdbIdFileName.get(idOrFile); + return id; + } + + public boolean isPDBFileRegistered(String idOrFile) + { + return pdbFileNameId.containsKey(idOrFile) + || pdbIdFileName.containsKey(idOrFile); + } + + private static StructureSelectionManager nullProvider = null; + public static StructureSelectionManager getStructureSelectionManager( + StructureSelectionManagerProvider context) + { + if (context == null) + { + if (nullProvider == null) + { + if (instances != null) + { + throw new Error(MessageManager.getString("error.implementation_error_structure_selection_manager_null"), + new NullPointerException(MessageManager.getString("exception.ssm_context_is_null"))); + } + else + { + nullProvider = new StructureSelectionManager(); + } + return nullProvider; + } + } + if (instances == null) + { + instances = new java.util.IdentityHashMap(); + } + StructureSelectionManager instance = instances.get(context); + if (instance == null) + { + if (nullProvider != null) + { + instance = nullProvider; + } + else + { + instance = new StructureSelectionManager(); + } + instances.put(context, instance); + } return instance; } @@ -90,6 +171,7 @@ public class StructureSelectionManager /** * register a listener for alignment sequence mouseover events + * * @param svl */ public void addStructureViewerListener(Object svl) @@ -116,9 +198,33 @@ public class StructureSelectionManager } /** + * Import structure data and register a structure mapping for broadcasting + * colouring, mouseovers and selection events (convenience wrapper). + * + * @param sequence + * - one or more sequences to be mapped to pdbFile + * @param targetChains + * - optional chain specification for mapping each sequence to pdb + * (may be nill, individual elements may be nill) + * @param pdbFile + * - structure data resource + * @param protocol + * - how to resolve data from resource + * @return null or the structure data parsed as a pdb file + */ + synchronized public MCview.PDBfile setMapping(SequenceI[] sequence, + String[] targetChains, String pdbFile, String protocol) + { + return setMapping(true, sequence, targetChains, pdbFile, protocol); + } + + /** * create sequence structure mappings between each sequence and the given * pdbFile (retrieved via the given protocol). * + * @param forStructureView + * when true, record the mapping for use in mouseOvers + * * @param sequence * - one or more sequences to be mapped to pdbFile * @param targetChains @@ -130,7 +236,8 @@ public class StructureSelectionManager * - how to resolve data from resource * @return null or the structure data parsed as a pdb file */ - synchronized public MCview.PDBfile setMapping(SequenceI[] sequence, + synchronized public MCview.PDBfile setMapping(boolean forStructureView, + SequenceI[] sequence, String[] targetChains, String pdbFile, String protocol) { /* @@ -138,9 +245,26 @@ public class StructureSelectionManager * the tried and tested MCview pdb mapping */ MCview.PDBfile pdb = null; + boolean parseSecStr=true; + for (SequenceI sq:sequence) + { + SequenceI ds = sq;while (ds.getDatasetSequence()!=null) { ds = ds.getDatasetSequence();}; + if (ds.getAnnotation()!=null) + { + for (AlignmentAnnotation ala:ds.getAnnotation()) + { + // false if any annotation present from this structure + if (MCview.PDBfile.isCalcIdForFile(ala.getCalcId(), pdbFile)) + { + parseSecStr = false; + } + } + } + } try { - pdb = new MCview.PDBfile(pdbFile, protocol); + pdb = new MCview.PDBfile(true, parseSecStr, pdbFile, protocol); + } catch (Exception ex) { ex.printStackTrace(); @@ -150,15 +274,33 @@ public class StructureSelectionManager String targetChain; for (int s = 0; s < sequence.length; s++) { + boolean infChain = true; if (targetChains != null && targetChains[s] != null) + { + infChain = false; targetChain = targetChains[s]; + } else if (sequence[s].getName().indexOf("|") > -1) { targetChain = sequence[s].getName().substring( sequence[s].getName().lastIndexOf("|") + 1); + if (targetChain.length() > 1) + { + if (targetChain.trim().length() == 0) + { + targetChain = " "; + } + else + { + // not a valid chain identifier + targetChain = ""; + } + } } else + { targetChain = ""; + } int max = -10; AlignSeq maxAlignseq = null; @@ -167,19 +309,17 @@ public class StructureSelectionManager boolean first = true; for (int i = 0; i < pdb.chains.size(); i++) { - // TODO: re http://issues.jalview.org/browse/JAL-583 : this patch may - // need to be revoked - PDBChain chain = ((PDBChain) pdb.chains.elementAt(i)); - if (targetChain.length() > 0 && !targetChain.equals(chain.id)) + PDBChain chain = (pdb.chains.elementAt(i)); + if (targetChain.length() > 0 && !targetChain.equals(chain.id) + && !infChain) { continue; // don't try to map chains don't match. } - // end of patch for limiting computed mappings // TODO: correctly determine sequence type for mixed na/peptide // structures AlignSeq as = new AlignSeq(sequence[s], - ((PDBChain) pdb.chains.elementAt(i)).sequence, - ((PDBChain) pdb.chains.elementAt(i)).isNa ? AlignSeq.DNA + pdb.chains.elementAt(i).sequence, + pdb.chains.elementAt(i).isNa ? AlignSeq.DNA : AlignSeq.PEP); as.calcScoreMatrix(); as.traceAlignment(); @@ -230,7 +370,8 @@ public class StructureSelectionManager // allocate enough slots to store the mapping from positions in // sequence[s] to the associated chain - int[][] mapping = new int[sequence[s].findPosition(sequence[s].getLength()) + 2][2]; + int[][] mapping = new int[sequence[s].findPosition(sequence[s] + .getLength()) + 2][2]; int resNum = -10000; int index = 0; @@ -247,24 +388,30 @@ public class StructureSelectionManager index++; } while (index < maxChain.atoms.size()); - if (mappings == null) + if (protocol.equals(jalview.io.AppletFormatAdapter.PASTE)) { - mappings = new StructureMapping[1]; + pdbFile = "INLINE" + pdb.id; } - else + StructureMapping newMapping = new StructureMapping(sequence[s], + pdbFile, pdb.id, maxChainId, mapping, + mappingDetails.toString()); + if (forStructureView) { - StructureMapping[] tmp = new StructureMapping[mappings.length + 1]; - System.arraycopy(mappings, 0, tmp, 0, mappings.length); - mappings = tmp; - } - if (protocol.equals(jalview.io.AppletFormatAdapter.PASTE)) - pdbFile = "INLINE" + pdb.id; + if (mappings == null) + { + mappings = new StructureMapping[1]; + } + else + { + StructureMapping[] tmp = new StructureMapping[mappings.length + 1]; + System.arraycopy(mappings, 0, tmp, 0, mappings.length); + mappings = tmp; + } - mappings[mappings.length - 1] = new StructureMapping(sequence[s], - pdbFile, pdb.id, maxChainId, mapping, - mappingDetails.toString()); - maxChain.transferResidueAnnotation(mappings[mappings.length - 1]); + mappings[mappings.length - 1] = newMapping; + } + maxChain.transferResidueAnnotation(newMapping); } // /////// @@ -276,15 +423,16 @@ public class StructureSelectionManager listeners.removeElement(svl); if (svl instanceof SequenceListener) { - for (int i=0;i 0) + if (results != null) { for (int i = 0; i < listeners.size(); i++) { Object li = listeners.elementAt(i); if (li instanceof SequenceListener) + { ((SequenceListener) li).highlightSequence(results); + } } } } @@ -404,14 +561,21 @@ public class StructureSelectionManager boolean hasSequenceListeners = handlingVamsasMo || seqmappings != null; SearchResults results = null; if (index == -1) + { index = seq.findPosition(indexpos); + } StructureListener sl; int atomNo = 0; for (int i = 0; i < listeners.size(); i++) { - if (listeners.elementAt(i) instanceof StructureListener) + Object listener = listeners.elementAt(i); + if (listener == source) { - sl = (StructureListener) listeners.elementAt(i); + continue; + } + if (listener instanceof StructureListener) + { + sl = (StructureListener) listener; if (mappings == null) { continue; @@ -434,7 +598,7 @@ public class StructureSelectionManager else { if (relaySeqMappings && hasSequenceListeners - && listeners.elementAt(i) instanceof SequenceListener) + && listener instanceof SequenceListener) { // DEBUG // System.err.println("relay Seq " + seq.getDisplayId(false) + " " + @@ -469,12 +633,10 @@ public class StructureSelectionManager } if (hasSequenceListeners) { - ((SequenceListener) listeners.elementAt(i)) - .highlightSequence(results); + ((SequenceListener) listener).highlightSequence(results); } } - else if (listeners.elementAt(i) instanceof VamsasListener - && !handlingVamsasMo) + else if (listener instanceof VamsasListener && !handlingVamsasMo) { // DEBUG // System.err.println("Vamsas from Seq " + seq.getDisplayId(false) + " @@ -482,8 +644,12 @@ public class StructureSelectionManager // index); // pass the mouse over and absolute position onto the // VamsasListener(s) - ((VamsasListener) listeners.elementAt(i)).mouseOver(seq, - indexpos, source); + ((VamsasListener) listener).mouseOver(seq, indexpos, source); + } + else if (listener instanceof SecondaryStructureListener) + { + ((SecondaryStructureListener) listener).mouseOverSequence(seq, + indexpos); } } } @@ -615,9 +781,13 @@ public class StructureSelectionManager AlignedCodonFrame[] codonFrames) { if (!add && (seqmappings == null || seqmappings.size() == 0)) + { return; + } if (seqmappings == null) + { seqmappings = new Vector(); + } if (codonFrames != null && codonFrames.length > 0) { for (int cf = 0; cf < codonFrames.length; cf++) @@ -655,8 +825,10 @@ public class StructureSelectionManager int[] nsr = new int[(seqmappingrefs == null) ? 1 : seqmappingrefs.length + 1]; if (seqmappingrefs != null && seqmappingrefs.length > 0) + { System.arraycopy(seqmappingrefs, 0, nsr, 0, seqmappingrefs.length); + } nsr[(seqmappingrefs == null) ? 0 : seqmappingrefs.length] = 1; seqmappingrefs = nsr; } @@ -675,7 +847,7 @@ public class StructureSelectionManager modifySeqMappingList(true, codonFrames); } - Vector sel_listeners = new Vector(); + Vector sel_listeners = new Vector(); public void addSelectionListener(SelectionListener selecter) { @@ -712,4 +884,91 @@ public class StructureSelectionManager } } } + + Vector view_listeners = new Vector(); + + public synchronized void sendViewPosition( + jalview.api.AlignmentViewPanel source, int startRes, int endRes, + int startSeq, int endSeq) + { + + if (view_listeners != null && view_listeners.size() > 0) + { + Enumeration listeners = view_listeners + .elements(); + while (listeners.hasMoreElements()) + { + AlignmentViewPanelListener slis = listeners.nextElement(); + if (slis != source) + { + slis.viewPosition(startRes, endRes, startSeq, endSeq, source); + } + ; + } + } + } + + public void finalize() throws Throwable + { + if (listeners != null) + { + listeners.clear(); + listeners = null; + } + if (pdbIdFileName != null) + { + pdbIdFileName.clear(); + pdbIdFileName = null; + } + if (sel_listeners != null) + { + sel_listeners.clear(); + sel_listeners = null; + } + if (view_listeners != null) + { + view_listeners.clear(); + view_listeners = null; + } + mappings = null; + seqmappingrefs = null; + } + + /** + * release all references associated with this manager provider + * + * @param jalviewLite + */ + public static void release(StructureSelectionManagerProvider jalviewLite) + { + // synchronized (instances) + { + if (instances == null) + { + return; + } + StructureSelectionManager mnger = (instances.get(jalviewLite)); + if (mnger != null) + { + instances.remove(jalviewLite); + try + { + mnger.finalize(); + } catch (Throwable x) + { + } + ; + } + } + } + + public void registerPDBEntry(PDBEntry pdbentry) + { + if (pdbentry.getFile() != null + && pdbentry.getFile().trim().length() > 0) + { + registerPDBFile(pdbentry.getId(), pdbentry.getFile()); + } + } + }