X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FCrossRefAction.java;h=9ad6596eb30492960a021635cb1bbac0d97aba6e;hb=afa061b7ecd1bc011096d9f2879448185874fcd3;hp=51ac2eebb7cf7747dd938fcb225af90bc393c833;hpb=cbeb7ad59d51b468c54ca3db2a2a7693060a2509;p=jalview.git diff --git a/src/jalview/gui/CrossRefAction.java b/src/jalview/gui/CrossRefAction.java index 51ac2ee..9ad6596 100644 --- a/src/jalview/gui/CrossRefAction.java +++ b/src/jalview/gui/CrossRefAction.java @@ -111,6 +111,13 @@ public class CrossRefAction implements Runnable FeatureSettingsModelI featureColourScheme = new SequenceFetcher() .getFeatureColourScheme(source); + if (dna && AlignmentUtils.looksLikeEnsembl(alignment)) + { + // override default featureColourScheme so products have Ensembl variant colours + featureColourScheme = new SequenceFetcher() + .getFeatureColourScheme(DBRefSource.ENSEMBL); + } + AlignmentI xrefsAlignment = makeCrossReferencesAlignment(dataset, xrefs); if (!dna) @@ -187,15 +194,24 @@ public class CrossRefAction implements Runnable /* * apply 'database source' feature configuration - * if any was found + * if any - first to the new splitframe view about to be displayed */ - // TODO is this the feature colouring for the original - // alignment or the fetched xrefs? either could be Ensembl + newFrame.getViewport().applyFeaturesStyle(featureColourScheme); copyThis.getViewport().applyFeaturesStyle(featureColourScheme); + /* + * and for JAL-3330 also to original alignFrame view(s) + * this currently trashes any original settings. + */ + for (AlignmentViewPanel origpanel: alignFrame.getAlignPanels()) { + origpanel.getAlignViewport() + .mergeFeaturesStyle(featureColourScheme); + } + SplitFrame sf = new SplitFrame(dna ? copyThis : newFrame, dna ? newFrame : copyThis); + newFrame.setVisible(true); copyThis.setVisible(true); String linkedTitle = MessageManager