X-Git-Url: http://source.jalview.org/gitweb/?p=jalviewjs.git;a=blobdiff_plain;f=src%2Fjalview%2Frenderer%2FAnnotationRenderer.java;fp=src%2Fjalview%2Frenderer%2FAnnotationRenderer.java;h=231187fce30e7ec5c62c1f946f796f454c5ccd5c;hp=debbf9a0999b40b6bf2e479fcfdaad04ed1a5967;hb=36d803e4a1f98728e91e80de5fa0b95e0cadb0d4;hpb=5b669b6c1a4f1f29b178283a46bc22fcd66aabad diff --git a/src/jalview/renderer/AnnotationRenderer.java b/src/jalview/renderer/AnnotationRenderer.java index debbf9a..231187f 100644 --- a/src/jalview/renderer/AnnotationRenderer.java +++ b/src/jalview/renderer/AnnotationRenderer.java @@ -533,7 +533,7 @@ public class AnnotationRenderer g.drawImage(fadedImage, 0, y - row.height, imgWidth, y, 0, y - row.height, imgWidth, y, annotationPanel); g.setColor(Color.black); - // g.drawString("Calculating "+aa[i].label+"....",20, y-row.height/2); + // awt2swing.Util.drawString(g, "Calculating "+aa[i].label+"....",20, y-row.height/2); continue; } @@ -547,7 +547,7 @@ public class AnnotationRenderer * annotationPanel.imgWidth, y, annotationPanel); * * g.setColor(Color.black); // - * g.drawString("Calculating Conservation.....",20, y-row.height/2); + * awt2swing.Util.drawString(g, "Calculating Conservation.....",20, y-row.height/2); * * continue; } else if (annotationPanel.av.updatingConservation && * aa[i].label.equals("Quality")) { @@ -556,7 +556,7 @@ public class AnnotationRenderer * row.height, annotationPanel.imgWidth, y, 0, y - row.height, * annotationPanel.imgWidth, y, annotationPanel); * g.setColor(Color.black); // / - * g.drawString("Calculating Quality....",20, y-row.height/2); + * awt2swing.Util.drawString(g, "Calculating Quality....",20, y-row.height/2); * * continue; } */ @@ -664,7 +664,7 @@ public class AnnotationRenderer if (column == 0 || row.graph > 0) { - g.drawString(displayChar, (x * charWidth) + charOffset, y + awt2swing.Util.drawString(g, displayChar, (x * charWidth) + charOffset, y + iconOffset); } else if (row_annotations[column - 1] == null @@ -673,7 +673,7 @@ public class AnnotationRenderer .equals(row_annotations[column - 1].displayCharacter) || (displayChar .length() < 2 && row_annotations[column].secondaryStructure == ' '))) { - g.drawString(displayChar, x * charWidth + charOffset, y + awt2swing.Util.drawString(g, displayChar, x * charWidth + charOffset, y + iconOffset); } g.setFont(ofont); @@ -1413,12 +1413,12 @@ public class AnnotationRenderer { final String codonTranslation = ResidueProperties .codonTranslate(new String(dc)); - colour = profcolour.findColour(codonTranslation.charAt(0), + colour = profcolour.findColourSeq(codonTranslation.charAt(0), column, null); } else { - colour = profcolour.findColour(dc[0], column, null); + colour = profcolour.findColourSeq(dc[0], column, null); } g.setColor(colour == Color.white ? Color.lightGray : colour);