JAL-1807 - Bob's last(?) before leaving Dundee -- adds fast file loading

[jalviewjs.git] / site / j2s / jalview / renderer / AnnotationRenderer.js

diff --git a/site/j2s/jalview/renderer/AnnotationRenderer.js b/site/j2s/jalview/renderer/AnnotationRenderer.js
index 221e5d3..4fa68cb 100644 (file)
--- a/site/j2s/jalview/renderer/AnnotationRenderer.js
+++ b/site/j2s/jalview/renderer/AnnotationRenderer.js
@@ -1,5 +1,5 @@
 Clazz.declarePackage ("jalview.renderer");
-Clazz.load (["jalview.util.Platform", "java.awt.Color"], "jalview.renderer.AnnotationRenderer", ["jalview.analysis.AAFrequency", "$.CodingUtils", "$.StructureFrequency", "jalview.jsdev.RegExp", "jalview.schemes.NucleotideColourScheme", "$.ResidueProperties", "$.ZappoColourScheme", "java.awt.BasicStroke", "java.awt.geom.AffineTransform", "java.util.BitSet"], function () {
+Clazz.load (["jalview.util.Platform", "java.awt.Color"], "jalview.renderer.AnnotationRenderer", ["awt2swing.Util", "jalview.analysis.AAFrequency", "$.CodingUtils", "$.StructureFrequency", "jalview.jsdev.RegExp", "jalview.schemes.NucleotideColourScheme", "$.ResidueProperties", "$.ZappoColourScheme", "java.awt.BasicStroke", "java.awt.geom.AffineTransform", "java.util.BitSet"], function () {
 c$ = Clazz.decorateAsClass (function () {
 this.debugRedraw = false;
 this.charWidth = 0;
@@ -270,9 +270,9 @@ g.setColor (java.awt.Color.black);
 } else {
 g.setColor (row_annotations[column].colour);
 }if (column == 0 || row.graph > 0) {
-g.drawString (displayChar, (x * this.charWidth) + charOffset, y + iconOffset);
+awt2swing.Util.drawString (g, displayChar, (x * this.charWidth) + charOffset, y + iconOffset);
 } else if (row_annotations[column - 1] == null || (labelAllCols || !displayChar.equals (row_annotations[column - 1].displayCharacter) || (displayChar.length < 2 && row_annotations[column].secondaryStructure == ' '))) {
-g.drawString (displayChar, x * this.charWidth + charOffset, y + iconOffset);
+awt2swing.Util.drawString (g, displayChar, x * this.charWidth + charOffset, y + iconOffset);
 }g.setFont (ofont);
 }}if (row.hasIcons) {
 var ss = validRes ? row_annotations[column].secondaryStructure : '-';
@@ -663,9 +663,9 @@ lm = g.getFontMetrics ().getLineMetrics (dc, 0, 1, g);
 var colour = null;
 if (isCdnaProfile) {
 var codonTranslation = jalview.schemes.ResidueProperties.codonTranslate ( String.instantialize (dc));
-colour = this.profcolour.findColour (codonTranslation.charAt (0), column, null);
+colour = this.profcolour.findColourSeq (codonTranslation.charAt (0), column, null);
 } else {
-colour = this.profcolour.findColour (dc[0], column, null);
+colour = this.profcolour.findColourSeq (dc[0], column, null);
 }g.setColor (colour === java.awt.Color.white ? java.awt.Color.lightGray : colour);
 hght = (ht + (scl - lm.getDescent () - lm.getBaselineOffsets ()[lm.getBaselineIndex ()]));
 g.drawChars (dc, 0, dc.length, x * this.charWidth, Clazz.doubleToInt (hght));