From: Jim Procter Date: Wed, 17 Jun 2015 15:35:29 +0000 (+0100) Subject: Merge branch 'develop' into features/JAL-653_gffalignments X-Git-Tag: Release_2_10_0~296^2~140^2 X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=2a9991ef1eb02d97e9c8ed1644f292117ae6f600;p=jalview.git Merge branch 'develop' into features/JAL-653_gffalignments update for incoming changes and finessing against JAL-1641 --- 2a9991ef1eb02d97e9c8ed1644f292117ae6f600 diff --cc src/jalview/appletgui/AlignFrame.java index 77747d1,1510a14..a14da77 --- a/src/jalview/appletgui/AlignFrame.java +++ b/src/jalview/appletgui/AlignFrame.java @@@ -4179,35 -4207,4 +4208,36 @@@ public class AlignFrame extends Embmenu { this.splitFrame = sf; } ++ + // may not need this + @Override + public void setShowSeqFeatures(boolean b) + { + // showSeqFeatures.setSelected(b); + viewport.setShowSequenceFeatures(b); + + } + + @Override + public void setMenusForViewport() + { + // setMenusFromViewport(viewport); + + } + @Override + public void refreshFeatureUI(boolean enableIfNecessary) + { + if (enableIfNecessary) + { + sequenceFeatures.setState(true); + alignPanel.av.setShowSequenceFeatures(true); + } + } + + @Override + public FeatureSettingsControllerI getFeatureSettingsUI() + { + return alignPanel.av.featureSettings; + } + }