X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FAlignFrame.java;h=db1f9c9e84c326e0dc94f13f5a6f84c86c3178eb;hb=3ca1aeccca8d3adfd55d1ff8bd447f8bf0d4ac2f;hp=fcc4059841e7746112b13f91c3523c34a3684a3f;hpb=7c9da5584b986ed396f5ff90b35a9fc1c79daec4;p=jalview.git diff --git a/src/jalview/appletgui/AlignFrame.java b/src/jalview/appletgui/AlignFrame.java index fcc4059..db1f9c9 100755 --- a/src/jalview/appletgui/AlignFrame.java +++ b/src/jalview/appletgui/AlignFrame.java @@ -808,14 +808,14 @@ public class AlignFrame if (cs instanceof ResidueColourScheme) { - ( (ResidueColourScheme) cs).setThreshold(threshold); + ( (ResidueColourScheme) cs).setThreshold(threshold, viewport.getIgnoreGapsConsensus()); } viewport.setGlobalColourScheme(cs); } else if (cs instanceof ResidueColourScheme) { - ( (ResidueColourScheme) cs).setThreshold(0); + ( (ResidueColourScheme) cs).setThreshold(0, viewport.getIgnoreGapsConsensus()); } if (viewport.getConservationSelected()) @@ -885,7 +885,7 @@ public class AlignFrame { if (sg.cs instanceof ResidueColourScheme) { - ( (ResidueColourScheme) sg.cs).setThreshold(threshold); + ( (ResidueColourScheme) sg.cs).setThreshold(threshold, viewport.getIgnoreGapsConsensus()); } sg.cs.setConsensus(AAFrequency.calculate(sg.sequences, 0, sg.getWidth())); @@ -914,6 +914,8 @@ public class AlignFrame } } + updateCSConsensus(); + if (alignPanel.getOverviewPanel() != null) { alignPanel.getOverviewPanel().updateOverviewImage(); @@ -922,6 +924,12 @@ public class AlignFrame alignPanel.repaint(); } + public void updateCSConsensus() + { + //Colour schemes must have their consensus updated + + } + protected void modifyPID_actionPerformed(ActionEvent e) { if (viewport.getAbovePIDThreshold()) @@ -1174,7 +1182,7 @@ public class AlignFrame int y = 5, x = 7; g.setColor(Color.black); g.setFont(new Font("Helvetica", Font.BOLD, 14)); - g.drawString("JalView - Release 2.01", 200, y += fh); + g.drawString("JalView - Release 2.02", 200, y += fh); g.setFont(new Font("Helvetica", Font.PLAIN, 12)); g.drawString("Authors: Michele Clamp, James Cuff, Steve Searle, Andrew Waterhouse, Jim Procter & Geoff Barton.", x, y += fh * 2);