X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FAlignViewport.java;h=a43b89b321a5336ed04e91f322338330919ccf80;hb=31714b90648bba773f68736b8c1700ae53805eee;hp=3c520e39690f88bb3c2b02edd69197f2fc2344fa;hpb=1f029391e9e263b132a62eaefcc2fe68badacfd6;p=jalview.git diff --git a/src/jalview/gui/AlignViewport.java b/src/jalview/gui/AlignViewport.java index 3c520e3..a43b89b 100644 --- a/src/jalview/gui/AlignViewport.java +++ b/src/jalview/gui/AlignViewport.java @@ -20,6 +20,17 @@ */ package jalview.gui; +import java.awt.Container; +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.List; + +import javax.swing.JInternalFrame; + import jalview.analysis.AlignmentUtils; import jalview.analysis.AnnotationSorter.SequenceAnnotationOrder; import jalview.api.AlignViewportI; @@ -29,6 +40,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; @@ -52,17 +64,6 @@ import jalview.util.MessageManager; import jalview.viewmodel.AlignmentViewport; import jalview.ws.params.AutoCalcSetting; -import java.awt.Container; -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.List; - -import javax.swing.JInternalFrame; - /** * DOCUMENT ME! * @@ -123,14 +124,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(); @@ -185,14 +186,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) @@ -290,8 +291,8 @@ public class AlignViewport extends AlignmentViewport schemeName = Cache.getDefault(Preferences.DEFAULT_COLOUR, ResidueColourScheme.NONE); } - ColourSchemeI colourScheme = ColourSchemeProperty - .getColourScheme(this, alignment, schemeName); + ColourSchemeI colourScheme = ColourSchemeProperty.getColourScheme(this, + alignment, schemeName); residueShading = new ResidueShader(colourScheme); if (colourScheme instanceof UserColourScheme) @@ -594,7 +595,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); } } @@ -740,7 +741,7 @@ public class AlignViewport extends AlignmentViewport final String question = JvSwingUtils.wrapTooltip(true, MessageManager.getString("label.open_split_window?")); final AlignViewport us = this; - + /* * options No, Split Window, New Window correspond to * dialog responses 0, 1, 2 (even though JOptionPane shows them @@ -752,7 +753,7 @@ public class AlignViewport extends AlignmentViewport @Override public void run() { - addDataToAlignment(al); + addDataToAlignment(al); } }).setResponseHandler(1, new Runnable() { @@ -769,7 +770,7 @@ public class AlignViewport extends AlignmentViewport us.openLinkedAlignmentAs(al, title, false); } }); - dialog.showDialog(question, + dialog.showDialog(question, MessageManager.getString("label.open_split_window"), JvOptionPane.DEFAULT_OPTION, JvOptionPane.PLAIN_MESSAGE, null, options, options[0]); @@ -777,7 +778,7 @@ public class AlignViewport extends AlignmentViewport protected void openLinkedAlignmentAs(AlignmentI al, String title, boolean newWindowOrSplitPane) - { + { /* * Identify protein and dna alignments. Make a copy of this one if opening * in a new split pane. @@ -823,8 +824,7 @@ 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) { } @@ -990,10 +990,10 @@ public class AlignViewport extends AlignmentViewport } /** - * 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. + * 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 */ @@ -1006,8 +1006,8 @@ public class AlignViewport extends AlignmentViewport /** * 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. + * renderer. Feature ordering is always adjusted, and transparency is always + * set regardless. * * @param featureSettings * @param mergeOnly @@ -1019,12 +1019,13 @@ public class AlignViewport extends AlignmentViewport { return; } - + FeatureRenderer fr = getAlignPanel().getSeqPanel().seqCanvas .getFeatureRenderer(); List origRenderOrder = new ArrayList<>(); List origGroups = new ArrayList<>(); - // preserve original render order - allows differentiation between user configured colours and autogenerated ones + // preserve original render order - allows differentiation between user + // configured colours and autogenerated ones origRenderOrder.addAll(fr.getRenderOrder()); origGroups.addAll(fr.getFeatureGroups()); @@ -1056,7 +1057,8 @@ public class AlignViewport extends AlignmentViewport && origColour.getColour().equals( ColorUtils.createColourFromName(type))))) { - // if we are merging, only update if there wasn't already a colour defined for + // if we are merging, only update if there wasn't already a colour + // defined for // this type if (preferredColour != null) { @@ -1080,7 +1082,8 @@ public class AlignViewport extends AlignmentViewport { if (!mergeOnly || !origGroups.contains(group)) { - // when merging, display groups only if the aren't already marked as not visible + // when merging, display groups only if the aren't already marked as not + // visible fr.setGroupVisibility(group, featureSettings.isGroupDisplayed(group)); } @@ -1098,6 +1101,8 @@ public class AlignViewport extends AlignmentViewport fr.orderFeatures(featureSettings); } fr.setTransparency(featureSettings.getTransparency()); + + fr.notifyFeaturesChanged(); } public String getViewName()