X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fschemes%2FGraduatedColor.java;h=2d1c572ae8028c9561029da05b63bb8c5201cc47;hb=076b4cf9df955f03694f036ebc60728310654ae5;hp=e8bf48338624b6a6fdae367c68e3c79805cf8f51;hpb=47168f025aefdaa044802bd5f8f510ffe43a4808;p=jalview.git diff --git a/src/jalview/schemes/GraduatedColor.java b/src/jalview/schemes/GraduatedColor.java index e8bf483..2d1c572 100644 --- a/src/jalview/schemes/GraduatedColor.java +++ b/src/jalview/schemes/GraduatedColor.java @@ -1,6 +1,6 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2) - * Copyright (C) 2014 The Jalview Authors + * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$) + * Copyright (C) $$Year-Rel$$ The Jalview Authors * * This file is part of Jalview. * @@ -20,6 +20,7 @@ */ package jalview.schemes; +import jalview.api.FeatureColourI; import jalview.datamodel.SequenceFeature; import java.awt.Color; @@ -118,6 +119,11 @@ public class GraduatedColor updateBounds(min, max); } + public GraduatedColor(FeatureColourI col) + { + setColourByLabel(col.isColourByLabel()); + } + public Color getMinColor() { return new Color(lr, lg, lb); @@ -145,7 +151,7 @@ public class GraduatedColor public boolean isColored(SequenceFeature feature) { float val = feature.getScore(); - if (val == Float.NaN) + if (Float.isNaN(val)) { return true; } @@ -153,7 +159,7 @@ public class GraduatedColor { return true; } - if (this.thrsh == Float.NaN) + if (Float.isNaN(this.thrsh)) { return true; } @@ -211,7 +217,7 @@ public class GraduatedColor return getMaxColor(); } float scr = feature.getScore(); - if (scr == Float.NaN) + if (Float.isNaN(scr)) { return getMinColor(); }