X-Git-Url: http://source.jalview.org/gitweb/?p=jalviewjs.git;a=blobdiff_plain;f=site%2Fj2s%2Fjalview%2Fschemes%2FAnnotationColourGradient.js;h=adc6c46338c3b60f36598ceef6cfc2575f42aa87;hp=a1b8db65fd05d67845dc2cda388db4e873ce9a10;hb=36d803e4a1f98728e91e80de5fa0b95e0cadb0d4;hpb=5b669b6c1a4f1f29b178283a46bc22fcd66aabad diff --git a/site/j2s/jalview/schemes/AnnotationColourGradient.js b/site/j2s/jalview/schemes/AnnotationColourGradient.js index a1b8db6..adc6c46 100644 --- a/site/j2s/jalview/schemes/AnnotationColourGradient.js +++ b/site/j2s/jalview/schemes/AnnotationColourGradient.js @@ -121,11 +121,11 @@ Clazz.defineMethod (c$, "getMaxColour", function () { return new java.awt.Color (Clazz.floatToInt (this.r1 + this.rr), Clazz.floatToInt (this.g1 + this.gg), Clazz.floatToInt (this.b1 + this.bb)); }); -Clazz.defineMethod (c$, "findColour", +Clazz.overrideMethod (c$, "findColour", function (c) { return java.awt.Color.red; }, "~S"); -Clazz.defineMethod (c$, "findColour", +Clazz.overrideMethod (c$, "findColourSeq", function (c, j, seq) { var currentColour = java.awt.Color.white; var annotation = (this.seqAssociated && this.seqannot != null ? this.seqannot.get (seq) : this.annotation); @@ -140,7 +140,7 @@ currentColour = aj.colour; } else if (annotation.hasIcons && annotation.graph == 0) { if (aj.secondaryStructure > ' ' && aj.secondaryStructure != '.' && aj.secondaryStructure != '-') { if (this.colourScheme != null) { -currentColour = this.colourScheme.findColour (c, j, seq); +currentColour = this.colourScheme.findColourSeq (c, j, seq); } else { if (annotation.isRNA ()) { currentColour = jalview.schemes.ColourSchemeProperty.rnaHelices[Clazz.floatToInt (aj.value)]; @@ -150,7 +150,7 @@ currentColour = annotation.annotations[j].secondaryStructure == 'H' ? jalview.re return java.awt.Color.white; }} else if (this.noGradient) { if (this.colourScheme != null) { -currentColour = this.colourScheme.findColour (c, j, seq); +currentColour = this.colourScheme.findColourSeq (c, j, seq); } else { if (aj.colour != null) { currentColour = aj.colour;