From: gmungoc Date: Thu, 10 Aug 2017 15:24:53 +0000 (+0100) Subject: Merge branch 'develop' into features/JAL-2446NCList X-Git-Tag: Release_2_10_3b1~151 X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=d1bb7a31fc091606aedbc255a5766ac79e36fa91;hp=29ac9aa26871544cbbd43f4ea313144a6bd8ae39;p=jalview.git Merge branch 'develop' into features/JAL-2446NCList --- diff --git a/help/html/releases.html b/help/html/releases.html index d2d27db..e998d99 100755 --- a/help/html/releases.html +++ b/help/html/releases.html @@ -70,12 +70,21 @@ li:before {
- 2.10.2
8/8/2017
+ 2.10.2
15/8/2017
- General + Calculations + Rendering + + Overview + + + Data import/export + - Application + User Interface + 3D Structure + - Experimental features - - Applet + Web Services - Test Suite + + Scripting + Example files + + Documentation + + Test Suite +
- General + Calculations + User Interface + + Rendering + - Documentation - - Application + Data import/export + Web Services + + Application UI + Applet + Test Suite + New Known Issues - Test Suite - -
- - +
2.10.1
29/11/2016
diff --git a/src/jalview/gui/Jalview2XML.java b/src/jalview/gui/Jalview2XML.java index 5070884..d625918 100644 --- a/src/jalview/gui/Jalview2XML.java +++ b/src/jalview/gui/Jalview2XML.java @@ -4484,8 +4484,8 @@ public class Jalview2XML } af.viewport.setGlobalColourScheme(cs); - af.viewport.getResidueShading().setThreshold( - view.getPidThreshold(), true); + af.viewport.getResidueShading().setThreshold(view.getPidThreshold(), + view.getIgnoreGapsinConsensus()); af.viewport.getResidueShading().setConsensus( af.viewport.getSequenceConsensusHash()); af.viewport.setColourAppliesToAllGroups(false);