X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FAlignViewport.java;fp=src%2Fjalview%2Fgui%2FAlignViewport.java;h=69f155bb393fc4bb7fb5bbe6b5c1390bfe141e93;hb=4f094851cd2247ea2d982e7829a6f5b663042573;hp=ea9eb21641080720830d0e9f8c5aafd757e83320;hpb=424f6f03e8fb5e40cceca09fc8ffd72b41e3a9e4;p=jalview.git diff --git a/src/jalview/gui/AlignViewport.java b/src/jalview/gui/AlignViewport.java index ea9eb21..69f155b 100644 --- a/src/jalview/gui/AlignViewport.java +++ b/src/jalview/gui/AlignViewport.java @@ -295,18 +295,18 @@ public class AlignViewport extends AlignmentViewport implements { ColourSchemeI colourScheme = ColourSchemeProperty.getColourScheme( alignment, propertyValue); - globalColourScheme = new ResidueShader(colourScheme); + residueShading = new ResidueShader(colourScheme); if (colourScheme instanceof UserColourScheme) { - globalColourScheme = new ResidueShader( + residueShading = new ResidueShader( UserDefinedColours.loadDefaultColours()); - globalColourScheme.setThreshold(0, isIgnoreGapsConsensus()); + residueShading.setThreshold(0, isIgnoreGapsConsensus()); } - if (globalColourScheme != null) + if (residueShading != null) { - globalColourScheme.setConsensus(hconsensus); + residueShading.setConsensus(hconsensus); } } } @@ -385,9 +385,9 @@ public class AlignViewport extends AlignmentViewport implements super.setViewStyle(settingsForView); setFont(new Font(viewStyle.getFontName(), viewStyle.getFontStyle(), viewStyle.getFontSize()), false); - if (globalColourScheme != null) + if (residueShading != null) { - globalColourScheme.setConservationApplied(settingsForView + residueShading.setConservationApplied(settingsForView .isConservationColourSelected()); } }