X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fviewmodel%2Fseqfeatures%2FFeatureRendererModel.java;h=5b55e0516b949bac9920c9f70f230289226e4475;hb=c406d789d51e6ac1ff45e3568d37e9ed53025f03;hp=e912720335111681a04dae6d36342b3e0d9c2d28;hpb=08c587d9947f357382199bdb6900c263efc62739;p=jalview.git diff --git a/src/jalview/viewmodel/seqfeatures/FeatureRendererModel.java b/src/jalview/viewmodel/seqfeatures/FeatureRendererModel.java index e912720..5b55e05 100644 --- a/src/jalview/viewmodel/seqfeatures/FeatureRendererModel.java +++ b/src/jalview/viewmodel/seqfeatures/FeatureRendererModel.java @@ -21,6 +21,7 @@ package jalview.viewmodel.seqfeatures; import jalview.api.AlignViewportI; +import jalview.api.FeatureColourI; import jalview.api.FeaturesDisplayedI; import jalview.datamodel.AlignmentI; import jalview.datamodel.SequenceFeature; @@ -58,7 +59,7 @@ public abstract class FeatureRendererModel implements protected Object currentColour; /* - * ordering of rendering, where last means on top + * feature types in ordering of rendering, where last means on top */ protected String[] renderOrder; @@ -632,9 +633,18 @@ public abstract class FeatureRendererModel implements // Object c = featureColours.get(featureType); // if (c == null || c instanceof Color || (c instanceof GraduatedColor && // !((GraduatedColor)c).getMaxColor().equals(_col))) + if (col instanceof FeatureColourI) { - featureColours.put(featureType, col); + if (((FeatureColourI) col).isGraduatedColour()) + { + col = new GraduatedColor((FeatureColourI) col); + } + else + { + col = ((FeatureColourI) col).getColour(); + } } + featureColours.put(featureType, col); } public void setTransparency(float value)