X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Frenderer%2FAnnotationRenderer.java;fp=src%2Fjalview%2Frenderer%2FAnnotationRenderer.java;h=1cd3d3b5f55aa7b8af5111bc6cabf796a09a94ba;hb=d9f0a24d9662a0b530fd79b51108dd074d03d6e0;hp=1311405e8294cf3d2a6319a75aef1e459ebbdfdd;hpb=d27da609341db336cdda77a6cc880a6059d8a2d9;p=jalview.git diff --git a/src/jalview/renderer/AnnotationRenderer.java b/src/jalview/renderer/AnnotationRenderer.java index 1311405..1cd3d3b 100644 --- a/src/jalview/renderer/AnnotationRenderer.java +++ b/src/jalview/renderer/AnnotationRenderer.java @@ -1389,7 +1389,8 @@ public class AnnotationRenderer boolean isStructureProfile = profl[0] == AlignmentAnnotation.STRUCTURE_PROFILE; boolean isCdnaProfile = profl[0] == AlignmentAnnotation.CDNA_PROFILE; float ht = normaliseProfile ? y - _aa.graphHeight : y1; - final double normaliseFactor = normaliseProfile ? _aa.graphHeight : (y2 - y1); + final double normaliseFactor = normaliseProfile ? _aa.graphHeight + : (y2 - y1); /** * Render a single base for a sequence profile, a base pair for @@ -1440,7 +1441,7 @@ public class AnnotationRenderer s = new String(dc); } // next profl[] position is profile % for the character(s) - + int percent = profl[c++]; if (percent == 0) { @@ -1473,9 +1474,9 @@ public class AnnotationRenderer // (int)(scl)); // g.setColor(profcolour.findColour(dc[0]).darker()); - double sx = 1f * charWidth / fm.charsWidth(dc, 0, dc.length); + double sx = 1f * charWidth / fm.charsWidth(dc, 0, dc.length); double sy = newHeight / asc; - double newAsc = asc * sy; + double newAsc = asc * sy; double newDec = dec * sy; // it is not necessary to recalculate lm for the new font. // note: lm.getBaselineOffsets()[lm.getBaselineIndex()]) must be 0 @@ -1501,10 +1502,14 @@ public class AnnotationRenderer ht2 += newHeight; } else + /** + * Java only + * + * @j2sNative + */ { - /* - * Java ('normal') method is to scale the font to fit - */ + // Java ('normal') method is to scale the font to fit + final int hght = (int) (ht + (newAsc - newDec)); Font font = ofont .deriveFont(AffineTransform.getScaleInstance(sx, sy)); @@ -1523,7 +1528,7 @@ public class AnnotationRenderer Graphics2D g2 = (Graphics2D) g; g2.setStroke(new BasicStroke(1, BasicStroke.CAP_SQUARE, BasicStroke.JOIN_ROUND, 3f, new float[] - { 5f, 3f }, 0f)); + { 5f, 3f }, 0f)); y2 = (int) (y - ((_aa.threshold.value - min) / range) * _aa.graphHeight);