X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FAlignViewport.java;h=04618afee13696d3fb42cd7a969b8ae18ab5cfb3;hb=af1f57f65bad11f8e0329be6f539ae001630948d;hp=63cbfbd63e4e0fde4191460d0c4b567dadefa6e6;hpb=6c32da957091bb863e5bc70e94b13fd4bf72cf38;p=jalview.git diff --git a/src/jalview/gui/AlignViewport.java b/src/jalview/gui/AlignViewport.java index 63cbfbd..04618af 100644 --- a/src/jalview/gui/AlignViewport.java +++ b/src/jalview/gui/AlignViewport.java @@ -29,6 +29,7 @@ import jalview.api.FeatureSettingsModelI; import jalview.api.FeaturesDisplayedI; import jalview.api.ViewStyleI; import jalview.bin.Cache; +import jalview.bin.Console; import jalview.commands.CommandI; import jalview.datamodel.AlignedCodonFrame; import jalview.datamodel.Alignment; @@ -39,6 +40,7 @@ import jalview.datamodel.SearchResults; import jalview.datamodel.SearchResultsI; import jalview.datamodel.SequenceGroup; import jalview.datamodel.SequenceI; +import jalview.datamodel.features.FeatureMatcherSetI; import jalview.renderer.ResidueShader; import jalview.schemes.ColourSchemeI; import jalview.schemes.ColourSchemeProperty; @@ -47,6 +49,7 @@ import jalview.schemes.UserColourScheme; import jalview.structure.SelectionSource; import jalview.structure.StructureSelectionManager; import jalview.structure.VamsasSource; +import jalview.util.ColorUtils; import jalview.util.MessageManager; import jalview.viewmodel.AlignmentViewport; import jalview.ws.params.AutoCalcSetting; @@ -56,6 +59,7 @@ import java.awt.Dimension; import java.awt.Font; import java.awt.FontMetrics; import java.awt.Rectangle; +import java.util.ArrayList; import java.util.Hashtable; import java.util.Iterator; import java.util.List; @@ -68,18 +72,23 @@ import javax.swing.JInternalFrame; * @author $author$ * @version $Revision: 1.141 $ */ -public class AlignViewport extends AlignmentViewport +public class AlignViewport extends AlignmentViewport implements SelectionSource { + public final static int NO_SPLIT = 0; + + public final static int SPLIT_FRAME = 1; + + public final static int NEW_WINDOW = 2; Font font; boolean cursorMode = false; boolean antiAlias = false; - private Rectangle explodedGeometry; + private Rectangle explodedGeometry = null; - String viewName; + private String viewName = null; /* * Flag set true on the view that should 'gather' multiple views of the same @@ -92,12 +101,6 @@ public class AlignViewport extends AlignmentViewport private AnnotationColumnChooser annotationColumnSelectionState; - boolean validCharWidth; - - public boolean followSelection = true; - - private Hashtable calcIdParams = new Hashtable<>(); - /** * Creates a new AlignViewport object. * @@ -128,14 +131,14 @@ public class AlignViewport extends AlignmentViewport sequenceSetID = seqsetid; viewId = viewid; // TODO remove these once 2.4.VAMSAS release finished - if (Cache.log != null && Cache.log.isDebugEnabled() && seqsetid != null) + if (seqsetid != null) { - Cache.log.debug( + Console.debug( "Setting viewport's sequence set id : " + sequenceSetID); } - if (Cache.log != null && Cache.log.isDebugEnabled() && viewId != null) + if (viewId != null) { - Cache.log.debug("Setting viewport's view id : " + viewId); + Console.debug("Setting viewport's view id : " + viewId); } init(); @@ -190,14 +193,14 @@ public class AlignViewport extends AlignmentViewport sequenceSetID = seqsetid; viewId = viewid; // TODO remove these once 2.4.VAMSAS release finished - if (Cache.log != null && Cache.log.isDebugEnabled() && seqsetid != null) + if (seqsetid != null) { - Cache.log.debug( + Console.debug( "Setting viewport's sequence set id : " + sequenceSetID); } - if (Cache.log != null && Cache.log.isDebugEnabled() && viewId != null) + if (viewId != null) { - Cache.log.debug("Setting viewport's view id : " + viewId); + Console.debug("Setting viewport's view id : " + viewId); } if (hiddenColumns != null) @@ -212,14 +215,14 @@ public class AlignViewport extends AlignmentViewport */ private void applyViewProperties() { - antiAlias = Cache.getDefault("ANTI_ALIAS", false); + antiAlias = Cache.getDefault("ANTI_ALIAS", true); viewStyle.setShowJVSuffix(Cache.getDefault("SHOW_JVSUFFIX", true)); setShowAnnotation(Cache.getDefault("SHOW_ANNOTATIONS", true)); setRightAlignIds(Cache.getDefault("RIGHT_ALIGN_IDS", false)); setCentreColumnLabels(Cache.getDefault("CENTRE_COLUMN_LABELS", false)); - autoCalculateConsensus = Cache.getDefault("AUTO_CALC_CONSENSUS", true); + autoCalculateConsensusAndConservation = Cache.getDefault("AUTO_CALC_CONSENSUS", true); setPadGaps(Cache.getDefault("PAD_GAPS", true)); setShowNPFeats(Cache.getDefault("SHOW_NPFEATS_TOOLTIP", true)); @@ -260,14 +263,13 @@ public class AlignViewport extends AlignmentViewport setFont(new Font(fontName, style, Integer.parseInt(fontSize)), true); - AlignmentI al = getAlignment(); - al.setGapCharacter(Cache.getDefault("GAP_SYMBOL", "-").charAt(0)); + alignment.setGapCharacter(Cache.getDefault("GAP_SYMBOL", "-").charAt(0)); // We must set conservation and consensus before setting colour, // as Blosum and Clustal require this to be done - if (consensusProfiles == null && !isDataset) + if (hconsensus == null && !isDataset) { - if (!al.isNucleotide()) + if (!alignment.isNucleotide()) { showConservation = Cache.getDefault("SHOW_CONSERVATION", true); showQuality = Cache.getDefault("SHOW_QUALITY", true); @@ -279,6 +281,10 @@ public class AlignViewport extends AlignmentViewport showSequenceLogo = Cache.getDefault("SHOW_CONSENSUS_LOGO", false); normaliseSequenceLogo = Cache.getDefault("NORMALISE_CONSENSUS_LOGO", false); + // for now, use consensus options for Information till it gets its own + setShowHMMSequenceLogo(showSequenceLogo); + setNormaliseHMMSequenceLogo(normaliseSequenceLogo); + setShowInformationHistogram(showConsensusHistogram); showGroupConsensus = Cache.getDefault("SHOW_GROUP_CONSENSUS", false); showConsensus = Cache.getDefault("SHOW_IDENTITY", true); @@ -287,7 +293,7 @@ public class AlignViewport extends AlignmentViewport initAutoAnnotation(); // initInformation(); - String colourProperty = al.isNucleotide() + String colourProperty = alignment.isNucleotide() ? Preferences.DEFAULT_COLOUR_NUC : Preferences.DEFAULT_COLOUR_PROT; String schemeName = Cache.getProperty(colourProperty); @@ -297,8 +303,8 @@ public class AlignViewport extends AlignmentViewport schemeName = Cache.getDefault(Preferences.DEFAULT_COLOUR, ResidueColourScheme.NONE); } - ColourSchemeI colourScheme = ColourSchemeProperty - .getColourScheme(al, schemeName); + ColourSchemeI colourScheme = ColourSchemeProperty.getColourScheme(this, + alignment, schemeName); residueShading = new ResidueShader(colourScheme); if (colourScheme instanceof UserColourScheme) @@ -310,10 +316,14 @@ public class AlignViewport extends AlignmentViewport if (residueShading != null) { - residueShading.setConsensus(consensusProfiles); + residueShading.setConsensus(hconsensus); } + setColourAppliesToAllGroups(true); } + + boolean validCharWidth; + /** * {@inheritDoc} */ @@ -389,16 +399,16 @@ public class AlignViewport extends AlignmentViewport if (align != null) { StructureSelectionManager ssm = StructureSelectionManager - .getStructureSelectionManager(Desktop.instance); + .getStructureSelectionManager(Desktop.getInstance()); ssm.registerMappings(align.getCodonFrames()); } /* * replace mappings on our alignment */ - if (getAlignment() != null && align != null) + if (alignment != null && align != null) { - getAlignment().setCodonFrames(align.getCodonFrames()); + alignment.setCodonFrames(align.getCodonFrames()); } } @@ -411,7 +421,7 @@ public class AlignViewport extends AlignmentViewport if (mappings != null) { StructureSelectionManager ssm = StructureSelectionManager - .getStructureSelectionManager(Desktop.instance); + .getStructureSelectionManager(Desktop.getInstance()); for (AlignedCodonFrame acf : mappings) { if (noReferencesTo(acf)) @@ -449,32 +459,6 @@ public class AlignViewport extends AlignmentViewport } /** - * Returns an iterator over the visible column regions of the alignment - * - * @param selectedRegionOnly - * true to just return the contigs intersecting with the selected - * area - * @return - */ - public Iterator getViewAsVisibleContigs(boolean selectedRegionOnly) - { - int start = 0; - int end = 0; - if (selectedRegionOnly && selectionGroup != null) - { - start = selectionGroup.getStartRes(); - end = selectionGroup.getEndRes() + 1; - } - else - { - end = getAlignment().getWidth(); - } - - return getAlignment().getHiddenColumns().getVisContigsIterator(start, - end, false); - } - - /** * get hash of undo and redo list for the alignment * * @return long[] { historyList.hashCode, redoList.hashCode }; @@ -520,6 +504,8 @@ public class AlignViewport extends AlignmentViewport return false; } + public boolean followSelection = true; + /** * @return true if view selection should always follow the selections * broadcast by other selection sources @@ -536,35 +522,13 @@ public class AlignViewport extends AlignmentViewport public void sendSelection() { jalview.structure.StructureSelectionManager - .getStructureSelectionManager(Desktop.instance) + .getStructureSelectionManager(Desktop.getInstance()) .sendSelection(new SequenceGroup(getSelectionGroup()), new ColumnSelection(getColumnSelection()), new HiddenColumns(getAlignment().getHiddenColumns()), this); } - - /** - * return the alignPanel containing the given viewport. Use this to get the - * components currently handling the given viewport. - * - * @param av - * @return null or an alignPanel guaranteed to have non-null alignFrame - * reference - */ - public AlignmentPanel getAlignPanel() - { - AlignmentPanel[] aps = PaintRefresher - .getAssociatedPanels(this.getSequenceSetId()); - for (int p = 0; aps != null && p < aps.length; p++) - { - if (aps[p].av == this) - { - return aps[p]; - } - } - return null; - } - + public boolean getSortByTree() { return sortByTree; @@ -582,7 +546,20 @@ public class AlignViewport extends AlignmentViewport public StructureSelectionManager getStructureSelectionManager() { return StructureSelectionManager - .getStructureSelectionManager(Desktop.instance); + .getStructureSelectionManager(Desktop.getInstance()); + } + + + @Override + public boolean isNormaliseSequenceLogo() + { + return normaliseSequenceLogo; + } + + @Override +public void setNormaliseSequenceLogo(boolean state) + { + normaliseSequenceLogo = state; } /** @@ -595,6 +572,9 @@ public class AlignViewport extends AlignmentViewport return validCharWidth; } + + private Hashtable calcIdParams = new Hashtable<>(); + public AutoCalcSetting getCalcIdSettingsFor(String calcId) { return calcIdParams.get(calcId); @@ -609,7 +589,7 @@ public class AlignViewport extends AlignmentViewport // calculator.getRegisteredWorkersOfClass(settings.getWorkerClass()) if (needsUpdate) { - Cache.log.debug("trigger update for " + calcId); + Console.debug("trigger update for " + calcId); } } @@ -699,16 +679,20 @@ public class AlignViewport extends AlignmentViewport { if (AlignmentUtils.isMappable(toAdd, getAlignment())) { - if (openLinkedAlignment(toAdd, title)) - { - return; - } + openLinkedAlignment(toAdd, title); + return; } } + addDataToAlignment(toAdd); + } - /* - * No mappings, or offer declined - add sequences to this alignment - */ + /** + * adds sequences to this alignment + * + * @param toAdd + */ + void addDataToAlignment(AlignmentI toAdd) + { // TODO: JAL-407 regardless of above - identical sequences (based on ID and // provenance) should share the same dataset sequence @@ -730,8 +714,8 @@ public class AlignViewport extends AlignmentViewport } } - ranges.setEndSeq(getAlignment().getHeight()); - firePropertyChange("alignment", null, getAlignment().getSequences()); + ranges.setEndSeq(getAlignment().getHeight() - 1); // BH 2019.04.18 + notifyAlignment(); } /** @@ -743,33 +727,69 @@ public class AlignViewport extends AlignmentViewport * @param al * @param title */ - protected boolean openLinkedAlignment(AlignmentI al, String title) + protected void openLinkedAlignment(AlignmentI al, String title) { String[] options = new String[] { MessageManager.getString("action.no"), MessageManager.getString("label.split_window"), MessageManager.getString("label.new_window"), }; final String question = JvSwingUtils.wrapTooltip(true, MessageManager.getString("label.open_split_window?")); - int response = JvOptionPane.showOptionDialog(Desktop.desktop, question, + final AlignViewport us = this; + + /* + * options No, Split Window, New Window correspond to + * dialog responses 0, 1, 2 (even though JOptionPane shows them + * in reverse order) + */ + JvOptionPane dialog = JvOptionPane.newOptionDialog(Desktop.getDesktopPane()) + .setResponseHandler(NO_SPLIT, new Runnable() + { + @Override + public void run() + { + addDataToAlignment(al); + } + }).setResponseHandler(SPLIT_FRAME, new Runnable() + { + @Override + public void run() + { + // Make a copy of this one to open it in a splitframe + openLinkedAlignmentAs(getAlignPanel().alignFrame, + new Alignment(getAlignment()), al, title, + SPLIT_FRAME); + } + }).setResponseHandler(NEW_WINDOW, new Runnable() + { + @Override + public void run() + { + openLinkedAlignmentAs(null, getAlignment(), al, title, + NEW_WINDOW); + } + }); + dialog.showDialog(question, MessageManager.getString("label.open_split_window"), JvOptionPane.DEFAULT_OPTION, JvOptionPane.PLAIN_MESSAGE, null, options, options[0]); + } - if (response != 1 && response != 2) - { - return false; - } - final boolean openSplitPane = (response == 1); - final boolean openInNewWindow = (response == 2); - + /** + * Open a split frame or a new window + * + * @param al + * @param title + * @param mode + * SPLIT_FRAME or NEW_WINDOW + */ + public static void openLinkedAlignmentAs(AlignFrame thisFrame, + AlignmentI thisAlignment, AlignmentI al, String title, int mode) + { /* - * Identify protein and dna alignments. Make a copy of this one if opening - * in a new split pane. + * Identify protein and dna alignments. */ - AlignmentI thisAlignment = openSplitPane ? new Alignment(getAlignment()) - : getAlignment(); AlignmentI protein = al.isNucleotide() ? thisAlignment : al; - final AlignmentI cdna = al.isNucleotide() ? al : thisAlignment; + AlignmentI cdna = al.isNucleotide() ? al : thisAlignment; /* * Map sequences. At least one should get mapped as we have already passed @@ -787,7 +807,7 @@ public class AlignViewport extends AlignmentViewport AlignFrame newAlignFrame = new AlignFrame(al, AlignFrame.DEFAULT_WIDTH, AlignFrame.DEFAULT_HEIGHT); newAlignFrame.setTitle(title); - newAlignFrame.statusBar.setText(MessageManager + newAlignFrame.setStatus(MessageManager .formatMessage("label.successfully_loaded_file", new Object[] { title })); @@ -798,7 +818,7 @@ public class AlignViewport extends AlignmentViewport // alignFrame.setFileName(file, format); // } - if (openInNewWindow) + if (mode == NEW_WINDOW) { Desktop.addInternalFrame(newAlignFrame, title, AlignFrame.DEFAULT_WIDTH, AlignFrame.DEFAULT_HEIGHT); @@ -806,19 +826,16 @@ public class AlignViewport extends AlignmentViewport try { - newAlignFrame.setMaximum( - jalview.bin.Cache.getDefault("SHOW_FULLSCREEN", false)); + newAlignFrame.setMaximum(Cache.getDefault("SHOW_FULLSCREEN", false)); } catch (java.beans.PropertyVetoException ex) { } - if (openSplitPane) + if (mode == SPLIT_FRAME) { al.alignAs(thisAlignment); - protein = openSplitFrame(newAlignFrame, thisAlignment); + openSplitFrame(thisFrame, newAlignFrame, thisAlignment); } - - return true; } /** @@ -831,8 +848,8 @@ public class AlignViewport extends AlignmentViewport * cdna/protein complement alignment to show in the other split half * @return the protein alignment in the split frame */ - protected AlignmentI openSplitFrame(AlignFrame newAlignFrame, - AlignmentI complement) + static protected AlignmentI openSplitFrame(AlignFrame thisFrame, + AlignFrame newAlignFrame, AlignmentI complement) { /* * Make a new frame with a copy of the alignment we are adding to. If this @@ -841,7 +858,7 @@ public class AlignViewport extends AlignmentViewport */ AlignFrame copyMe = new AlignFrame(complement, AlignFrame.DEFAULT_WIDTH, AlignFrame.DEFAULT_HEIGHT); - copyMe.setTitle(getAlignPanel().alignFrame.getTitle()); + copyMe.setTitle(thisFrame.getTitle()); AlignmentI al = newAlignFrame.viewport.getAlignment(); final AlignFrame proteinFrame = al.isNucleotide() ? copyMe @@ -880,10 +897,9 @@ public class AlignViewport extends AlignmentViewport if (ap != null) { // modify GUI elements to reflect geometry change - Dimension idw = getAlignPanel().getIdPanel().getIdCanvas() - .getPreferredSize(); + Dimension idw = ap.getIdPanel().getIdCanvas().getPreferredSize(); idw.width = i; - getAlignPanel().getIdPanel().getIdCanvas().setPreferredSize(idw); + ap.getIdPanel().getIdCanvas().setPreferredSize(idw); } } @@ -972,19 +988,60 @@ public class AlignViewport extends AlignmentViewport @Override public void applyFeaturesStyle(FeatureSettingsModelI featureSettings) { + transferFeaturesStyles(featureSettings, false); + } + + /** + * Applies the supplied feature settings descriptor to currently known + * features. This supports an 'initial configuration' of feature colouring + * based on a preset or user favourite. This may then be modified in the usual + * way using the Feature Settings dialogue. + * + * @param featureSettings + */ + @Override + public void mergeFeaturesStyle(FeatureSettingsModelI featureSettings) + { + transferFeaturesStyles(featureSettings, true); + } + + /** + * when mergeOnly is set, then group and feature visibility or feature colours + * are not modified for features and groups already known to the feature + * renderer. Feature ordering is always adjusted, and transparency is always + * set regardless. + * + * @param featureSettings + * @param mergeOnly + */ + private void transferFeaturesStyles(FeatureSettingsModelI featureSettings, + boolean mergeOnly) + { if (featureSettings == null) { return; } - FeatureRenderer fr = getAlignPanel().getSeqPanel().seqCanvas .getFeatureRenderer(); + List origRenderOrder = new ArrayList(), + origGroups = new ArrayList(); + // preserve original render order - allows differentiation between user + // configured colours and autogenerated ones + origRenderOrder.addAll(fr.getRenderOrder()); + origGroups.addAll(fr.getFeatureGroups()); + fr.findAllFeatures(true); List renderOrder = fr.getRenderOrder(); FeaturesDisplayedI displayed = fr.getFeaturesDisplayed(); - displayed.clear(); + if (!mergeOnly) + { + // only clear displayed features if we are mergeing + displayed.clear(); + } // TODO this clears displayed.featuresRegistered - do we care? - + // + // JAL-3330 - JBP - yes we do - calling applyFeatureStyle to a view where + // feature visibility has already been configured is not very friendly /* * set feature colour if specified by feature settings * set visibility of all features @@ -993,13 +1050,36 @@ public class AlignViewport extends AlignmentViewport { FeatureColourI preferredColour = featureSettings .getFeatureColour(type); - if (preferredColour != null) + FeatureMatcherSetI preferredFilters = featureSettings + .getFeatureFilters(type); + FeatureColourI origColour = fr.getFeatureStyle(type); + if (!mergeOnly || (!origRenderOrder.contains(type) + || origColour == null + || (!origColour.isGraduatedColour() + && origColour.getColour() != null + && origColour.getColour().equals( + ColorUtils.createColourFromName(type))))) { - fr.setColour(type, preferredColour); - } - if (featureSettings.isFeatureDisplayed(type)) - { - displayed.setVisible(type); + // if we are merging, only update if there wasn't already a colour + // defined for + // this type + if (preferredColour != null) + { + fr.setColour(type, preferredColour); + } + if (preferredFilters != null + && (!mergeOnly || fr.getFeatureFilter(type) != null)) + { + fr.setFeatureFilter(type, preferredFilters); + } + if (featureSettings.isFeatureDisplayed(type)) + { + displayed.setVisible(type); + } + else if (featureSettings.isFeatureHidden(type)) + { + displayed.setHidden(type); + } } } @@ -1008,7 +1088,13 @@ public class AlignViewport extends AlignmentViewport */ for (String group : fr.getFeatureGroups()) { - fr.setGroupVisibility(group, featureSettings.isGroupDisplayed(group)); + if (!mergeOnly || !origGroups.contains(group)) + { + // when merging, display groups only if the aren't already marked as not + // visible + fr.setGroupVisibility(group, + featureSettings.isGroupDisplayed(group)); + } } /* @@ -1023,6 +1109,17 @@ public class AlignViewport extends AlignmentViewport fr.orderFeatures(featureSettings); } fr.setTransparency(featureSettings.getTransparency()); + + fr.notifyFeaturesChanged(); } + public String getViewName() + { + return viewName; + } + + public void setViewName(String viewName) + { + this.viewName = viewName; + } }