X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fviewmodel%2FAlignmentViewport.java;h=23c1d003cdcb2a327b363b39496a7c56ddc19057;hb=6c7cac79652fa6c7050311f73f36b9a9d05e6a6b;hp=ad120354bb0cf669ca38488b6fe0943b94adad74;hpb=d595e9cf7672de6d60165b536bc3def4b31f2352;p=jalview.git diff --git a/src/jalview/viewmodel/AlignmentViewport.java b/src/jalview/viewmodel/AlignmentViewport.java index ad12035..23c1d00 100644 --- a/src/jalview/viewmodel/AlignmentViewport.java +++ b/src/jalview/viewmodel/AlignmentViewport.java @@ -22,6 +22,7 @@ package jalview.viewmodel; import jalview.analysis.AnnotationSorter.SequenceAnnotationOrder; import jalview.analysis.Conservation; +import jalview.analysis.TreeModel; import jalview.api.AlignCalcManagerI; import jalview.api.AlignViewportI; import jalview.api.AlignmentViewPanel; @@ -33,12 +34,9 @@ import jalview.datamodel.AlignmentAnnotation; import jalview.datamodel.AlignmentI; import jalview.datamodel.AlignmentView; import jalview.datamodel.Annotation; -import jalview.datamodel.CigarArray; import jalview.datamodel.ColumnSelection; import jalview.datamodel.HiddenColumns; import jalview.datamodel.HiddenSequences; -import jalview.datamodel.ProfileI; -import jalview.datamodel.Profiles; import jalview.datamodel.ProfilesI; import jalview.datamodel.SearchResultsI; import jalview.datamodel.Sequence; @@ -70,6 +68,7 @@ import java.util.BitSet; import java.util.Deque; import java.util.HashMap; import java.util.Hashtable; +import java.util.Iterator; import java.util.List; import java.util.Map; @@ -83,7 +82,7 @@ import java.util.Map; public abstract class AlignmentViewport implements AlignViewportI, CommandListener, VamsasSource { - final protected ViewportRanges ranges; + protected ViewportRanges ranges; protected ViewStyleI viewStyle = new ViewStyle(); @@ -99,11 +98,31 @@ public abstract class AlignmentViewport protected Deque redoList = new ArrayDeque<>(); - /** * alignment displayed in the viewport. Please use get/setter */ protected AlignmentI alignment; + + /* + * probably unused indicator that view is of a dataset rather than an + * alignment + */ + + protected boolean ignoreBelowBackGroundFrequencyCalculation = false; + + protected boolean infoLetterHeight = false; + + protected AlignmentAnnotation occupancy; + + /** + * results of alignment consensus analysis for visible portion of view + */ + protected ProfilesI consensusProfiles; + + /** + * HMM profile for the alignment + */ + protected ProfilesI hmmProfiles; public AlignmentViewport(AlignmentI al) { @@ -591,7 +610,7 @@ public abstract class AlignmentViewport * alignment */ protected boolean isDataset = false; - + public void setDataset(boolean b) { isDataset = b; @@ -608,16 +627,12 @@ public abstract class AlignmentViewport public boolean autoCalculateConsensus = true; - public boolean autoCalculateInformation = true; - protected boolean autoCalculateStrucConsensus = true; protected boolean ignoreGapsInConsensusCalculation = false; - protected boolean ignoreBelowBackGroundFrequencyCalculation = false; - protected ResidueShaderI residueShading = new ResidueShader(); - + @Override public void setGlobalColourScheme(ColourSchemeI cs) { @@ -669,7 +684,8 @@ public abstract class AlignmentViewport * retain any colour thresholds per group while * changing choice of colour scheme (JAL-2386) */ - sg.setColourScheme(cs); + sg.setColourScheme( + cs == null ? null : cs.getInstance(this, sg)); if (cs != null) { sg.getGroupColourScheme().alignmentChanged(sg, @@ -690,7 +706,7 @@ public abstract class AlignmentViewport { return residueShading; } - + protected AlignmentAnnotation consensus; protected AlignmentAnnotation complementConsensus; @@ -707,21 +723,12 @@ public abstract class AlignmentViewport protected AlignmentAnnotation[] groupConservation; - protected List groupInformation = new ArrayList<>(); - - protected List information = new ArrayList<>(); - /** * results of alignment consensus analysis for visible portion of view */ protected ProfilesI hconsensus = null; /** - * results of information annotation analysis for the visible portion of view - */ - protected List hinformation = new ArrayList<>(); - - /** * results of cDNA complement consensus visible portion of view */ protected Hashtable[] hcomplementConsensus = null; @@ -733,7 +740,7 @@ public abstract class AlignmentViewport protected Hashtable[] hStrucConsensus = null; protected Conservation hconservation = null; - + @Override public void setConservation(Conservation cons) { @@ -771,31 +778,15 @@ public abstract class AlignmentViewport } @Override - public void setSequenceInformationHashes(List info) - { - hinformation = info; - } - - @Override - public void setSequenceInformationHash(ProfilesI info, int index) - { - if (hinformation.size() < index + 1) - { - return; - } - hinformation.set(index, info); - } - - @Override - public List getSequenceInformationHashes() + public void setHmmProfiles(ProfilesI info) { - return hinformation; + hmmProfiles = info; } @Override - public ProfilesI getSequenceInformationHash(int index) + public ProfilesI getHmmProfiles() { - return hinformation.get(index); + return hmmProfiles; } @Override @@ -836,18 +827,6 @@ public abstract class AlignmentViewport } @Override - public List getInformationAnnotations() - { - return information; - } - - @Override - public AlignmentAnnotation getInformationAnnotation(int index) - { - return information.get(index); - } - - @Override public AlignmentAnnotation getAlignmentGapAnnotation() { return gapcounts; @@ -939,18 +918,14 @@ public abstract class AlignmentViewport } } - /** - * trigger update of information annotation - */ @Override - public void updateInformation(final AlignmentViewPanel ap) + public void initInformationWorker(final AlignmentViewPanel ap) { if (calculator .getRegisteredWorkersOfClass(InformationThread.class) == null) { calculator.registerWorker(new InformationThread(this, ap)); } - } // --------START Structure Conservation @@ -1016,14 +991,19 @@ public abstract class AlignmentViewport strucConsensus = null; conservation = null; quality = null; + consensusProfiles = null; groupConsensus = null; groupConservation = null; hconsensus = null; + hconservation = null; hcomplementConsensus = null; - // colour scheme may hold reference to consensus - residueShading = null; - // TODO remove listeners from changeSupport? + gapcounts = null; + calculator = null; + residueShading = null; // may hold a reference to Consensus changeSupport = null; + ranges = null; + currentTree = null; + selectionGroup = null; setAlignment(null); } @@ -1069,17 +1049,17 @@ public abstract class AlignmentViewport /** * should hmm profile be rendered by default */ - protected boolean showHMMSequenceLogo = false; + protected boolean hmmShowSequenceLogo = false; /** * should hmm profile be rendered normalised to row height */ - protected boolean normaliseHMMSequenceLogo = false; + protected boolean hmmNormaliseSequenceLogo = false; /** * should information histograms be rendered by default */ - protected boolean showInformationHistogram = true; + protected boolean hmmShowHistogram = true; /** * @return the showConsensusProfile @@ -1096,7 +1076,7 @@ public abstract class AlignmentViewport @Override public boolean isShowHMMSequenceLogo() { - return showHMMSequenceLogo; + return hmmShowSequenceLogo; } /** @@ -1119,12 +1099,14 @@ public abstract class AlignmentViewport public void setShowHMMSequenceLogo(boolean showHMMSequenceLogo) { - if (showHMMSequenceLogo != this.showHMMSequenceLogo) + if (showHMMSequenceLogo != this.hmmShowSequenceLogo) { - this.showHMMSequenceLogo = showHMMSequenceLogo; - calculator.updateAnnotationFor(InformationThread.class); + this.hmmShowSequenceLogo = showHMMSequenceLogo; + // TODO: updateAnnotation if description (tooltip) will show + // profile in place of information content? + // calculator.updateAnnotationFor(InformationThread.class); } - this.showHMMSequenceLogo = showHMMSequenceLogo; + this.hmmShowSequenceLogo = showHMMSequenceLogo; } /** @@ -1138,11 +1120,10 @@ public abstract class AlignmentViewport /** * @param showInformationHistogram - * the showInformationHistogram to set */ public void setShowInformationHistogram(boolean showInformationHistogram) { - this.showInformationHistogram = showInformationHistogram; + this.hmmShowHistogram = showInformationHistogram; } /** @@ -1198,7 +1179,7 @@ public abstract class AlignmentViewport @Override public boolean isShowInformationHistogram() { - return this.showInformationHistogram; + return this.hmmShowHistogram; } /** @@ -1357,17 +1338,16 @@ public abstract class AlignmentViewport ignoreGapsInConsensusCalculation); } } - } public void setIgnoreBelowBackground(boolean b, AlignmentViewPanel ap) { ignoreBelowBackGroundFrequencyCalculation = b; - if (ap != null) - { - updateInformation(ap); - } + } + public void setInfoLetterHeight(boolean b, AlignmentViewPanel ap) + { + infoLetterHeight = b; } private long sgrouphash = -1, colselhash = -1; @@ -1430,6 +1410,12 @@ public abstract class AlignmentViewport return ignoreBelowBackGroundFrequencyCalculation; } + @Override + public boolean isInfoLetterHeight() + { + return infoLetterHeight; + } + // property change stuff // JBPNote Prolly only need this in the applet version. private PropertyChangeSupport changeSupport = new PropertyChangeSupport( @@ -1475,7 +1461,10 @@ public abstract class AlignmentViewport public void removePropertyChangeListener( java.beans.PropertyChangeListener listener) { - changeSupport.removePropertyChangeListener(listener); + if (changeSupport != null) + { + changeSupport.removePropertyChangeListener(listener); + } } /** @@ -1769,6 +1758,7 @@ public abstract class AlignmentViewport public void invertColumnSelection() { colSel.invertColumnSelection(0, alignment.getWidth(), alignment); + isColSelChanged(true); } @Override @@ -1814,13 +1804,6 @@ public abstract class AlignmentViewport } @Override - public CigarArray getViewAsCigars(boolean selectedRegionOnly) - { - return new CigarArray(alignment, alignment.getHiddenColumns(), - (selectedRegionOnly ? selectionGroup : null)); - } - - @Override public jalview.datamodel.AlignmentView getAlignmentView( boolean selectedOnly) { @@ -1881,8 +1864,12 @@ public abstract class AlignmentViewport if (alignment.getHiddenColumns() != null && alignment.getHiddenColumns().hasHiddenColumns()) { - selection = alignment.getHiddenColumns() - .getVisibleSequenceStrings(start, end, seqs); + for (i = 0; i < iSize; i++) + { + Iterator blocks = alignment.getHiddenColumns() + .getVisContigsIterator(start, end + 1, false); + selection[i] = seqs[i].getSequenceStringFromIterator(blocks); + } } else { @@ -1909,10 +1896,10 @@ public abstract class AlignmentViewport { if (start == 0) { - start = hidden.adjustForHiddenColumns(start); + start = hidden.visibleToAbsoluteColumn(start); } - end = hidden.getHiddenBoundaryRight(start); + end = hidden.getNextHiddenBoundary(false, start); if (start == end) { end = max; @@ -1927,8 +1914,8 @@ public abstract class AlignmentViewport if (hidden != null && hidden.hasHiddenColumns()) { - start = hidden.adjustForHiddenColumns(end); - start = hidden.getHiddenBoundaryLeft(start) + 1; + start = hidden.visibleToAbsoluteColumn(end); + start = hidden.getNextHiddenBoundary(true, start) + 1; } } while (end < max); @@ -1950,13 +1937,13 @@ public abstract class AlignmentViewport AlignmentAnnotation clone = new AlignmentAnnotation(annot); if (selectedOnly && selectionGroup != null) { - alignment.getHiddenColumns().makeVisibleAnnotation( + clone.makeVisibleAnnotation( selectionGroup.getStartRes(), selectionGroup.getEndRes(), - clone); + alignment.getHiddenColumns()); } else { - alignment.getHiddenColumns().makeVisibleAnnotation(clone); + clone.makeVisibleAnnotation(alignment.getHiddenColumns()); } ala.add(clone); } @@ -2001,16 +1988,6 @@ public abstract class AlignmentViewport { updateStrucConsensus(ap); } - initInformation(); - updateInformation(ap); - - List hmmSequences; - hmmSequences = alignment.getHMMConsensusSequences(false); - - for (SequenceI seq : hmmSequences) - { - seq.updateHMMMapping(); - } // Reset endRes of groups if beyond alignment width int alWidth = alignment.getWidth(); @@ -2033,7 +2010,6 @@ public abstract class AlignmentViewport updateAllColourSchemes(); calculator.restartWorkers(); - // alignment.adjustSequenceAnnotations(); } /** @@ -2144,35 +2120,6 @@ public abstract class AlignmentViewport } } - @Override - public void initInformation() - { - for (SequenceI seq : alignment.getHMMConsensusSequences(false)) - { - if (!seq.hasHMMAnnotation()) - { - AlignmentAnnotation information; - information = new AlignmentAnnotation(seq.getName(), - MessageManager.getString("label.information_description"), - new Annotation[1], 0f, 6.52f, - AlignmentAnnotation.BAR_GRAPH); - information.hasText = true; - information.autoCalculated = true; - information.hasText = true; - information.autoCalculated = false; - information.sequenceRef = seq; - information.setCalcId("HMM"); - this.information.add(information); - hinformation.add(new Profiles(new ProfileI[1])); - alignment.addAnnotation(information); - seq.updateHMMMapping(); - seq.setHasInfo(true); - seq.addAlignmentAnnotation(information); - } - } - - } - // these should be extracted from the view model - style and settings for // derived annotation private void initGapCounts() @@ -2362,7 +2309,7 @@ public abstract class AlignmentViewport sg.setshowSequenceLogo(showprf); sg.setShowConsensusHistogram(showConsHist); sg.setNormaliseSequenceLogo(normLogo); - sg.setshowHMMSequenceLogo(showHMMPrf); + sg.setShowHMMSequenceLogo(showHMMPrf); sg.setShowInformationHistogram(showInfoHist); sg.setNormaliseHMMSequenceLogo(normHMMLogo); } @@ -2968,7 +2915,7 @@ public abstract class AlignmentViewport int lastSeq = alignment.getHeight() - 1; List seqMappings = null; for (int seqNo = ranges - .getStartSeq(); seqNo < lastSeq; seqNo++, seqOffset++) + .getStartSeq(); seqNo <= lastSeq; seqNo++, seqOffset++) { sequence = getAlignment().getSequenceAt(seqNo); if (hiddenSequences != null && hiddenSequences.isHidden(sequence)) @@ -3064,6 +3011,8 @@ public abstract class AlignmentViewport */ private SearchResultsI searchResults = null; + protected TreeModel currentTree = null; + @Override public boolean hasSearchResults() { @@ -3128,7 +3077,7 @@ public abstract class AlignmentViewport AlignmentAnnotation[] annots = this.alignment.getAlignmentAnnotation(); for (AlignmentAnnotation annot : annots) { - if ("RF".equals(annot.getCalcId())) + if ("RF".equals(annot.label) || annot.label.contains("Reference")) { return true; } @@ -3136,4 +3085,101 @@ public abstract class AlignmentViewport return false; } + @Override + public void setCurrentTree(TreeModel tree) + { + currentTree = tree; + } + + @Override + public TreeModel getCurrentTree() + { + return currentTree; + } + + @Override + public boolean isNormaliseSequenceLogo() + { + return normaliseSequenceLogo; + } + + public void setNormaliseSequenceLogo(boolean state) + { + normaliseSequenceLogo = state; + } + + @Override + public boolean isNormaliseHMMSequenceLogo() + { + return hmmNormaliseSequenceLogo; + } + + public void setNormaliseHMMSequenceLogo(boolean state) + { + hmmNormaliseSequenceLogo = state; + } + + /** + * flag set to indicate if structure views might be out of sync with sequences + * in the alignment + */ + + private boolean needToUpdateStructureViews = false; + + @Override + public boolean isUpdateStructures() + { + return needToUpdateStructureViews; + } + + @Override + public void setUpdateStructures(boolean update) + { + needToUpdateStructureViews = update; + } + + @Override + public boolean needToUpdateStructureViews() + { + boolean update = needToUpdateStructureViews; + needToUpdateStructureViews = false; + return update; + } + + @Override + public void addSequenceGroup(SequenceGroup sequenceGroup) + { + alignment.addGroup(sequenceGroup); + + Color col = sequenceGroup.idColour; + if (col != null) + { + col = col.brighter(); + + for (SequenceI sq : sequenceGroup.getSequences()) + { + setSequenceColour(sq, col); + } + } + + if (codingComplement != null) + { + SequenceGroup mappedGroup = MappingUtils + .mapSequenceGroup(sequenceGroup, this, codingComplement); + if (mappedGroup.getSequences().size() > 0) + { + codingComplement.getAlignment().addGroup(mappedGroup); + + if (col != null) + { + for (SequenceI seq : mappedGroup.getSequences()) + { + codingComplement.setSequenceColour(seq, col); + } + } + } + // propagate the structure view update flag according to our own setting + codingComplement.setUpdateStructures(needToUpdateStructureViews); + } + } }