X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fschemes%2FFeatureColour.java;fp=src%2Fjalview%2Fschemes%2FFeatureColour.java;h=213868be1b85515b4411d41530b5dca1b6abb9e2;hb=bf0d052fef43e9809b7170dbfd372b3ea116391b;hp=bd58273faa3b795e5b8d4bb4c9ad8b0cacefc3b7;hpb=3e943322f9d66e8718316ba8bd03669adce65149;p=jalview.git diff --git a/src/jalview/schemes/FeatureColour.java b/src/jalview/schemes/FeatureColour.java index bd58273..213868b 100644 --- a/src/jalview/schemes/FeatureColour.java +++ b/src/jalview/schemes/FeatureColour.java @@ -111,10 +111,10 @@ public class FeatureColour implements FeatureColourI } /* - * autoScaled == true: colours range over actual score range; autoScaled == - * false ('abso'): colours range over min/max range + * autoScaled == true: colours range over actual score range + * autoScaled == false ('abso'): colours range over min/max range */ - boolean autoScaled = false; + boolean autoScaled = true; String tok = null, minval, maxval; if (mincol != null) { @@ -138,15 +138,15 @@ public class FeatureColour implements FeatureColourI } tok = gcol.nextToken(); gcol.nextToken(); // skip next '|' - if (tok.toLowerCase().indexOf("abso") != 0) + if (tok.toLowerCase().startsWith("abso")) { - minval = tok; - autoScaled = true; + minval = gcol.nextToken(); + gcol.nextToken(); // skip next '|' + autoScaled = false; } else { - minval = gcol.nextToken(); - gcol.nextToken(); // skip next '|' + minval = tok; } maxval = gcol.nextToken(); if (gcol.hasMoreTokens()) @@ -359,8 +359,7 @@ public class FeatureColour implements FeatureColourI * Sets the 'graduated colour' flag. If true, also sets 'colour by label' to * false. */ - @Override - public void setGraduatedColour(boolean b) + void setGraduatedColour(boolean b) { graduatedColour = b; if (b) @@ -643,7 +642,7 @@ public class FeatureColour implements FeatureColourI { sb.append(Format.getHexString(getMinColour())).append(BAR); sb.append(Format.getHexString(getMaxColour())).append(BAR); - if (isAutoScaled()) + if (!isAutoScaled()) { sb.append("abso").append(BAR); }