X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Frenderer%2FAnnotationRenderer.java;h=d943d3932fb4de3f980151e09b09bc4b0c0f82ae;hb=81d1b5ee333dee61382971eca41792d6a64a29fc;hp=548291c599b6724aeaae22925a0d7a325f7337d5;hpb=577b0bf651763fe609eb6d6343754662023b3eac;p=jalview.git diff --git a/src/jalview/renderer/AnnotationRenderer.java b/src/jalview/renderer/AnnotationRenderer.java index 548291c..d943d39 100644 --- a/src/jalview/renderer/AnnotationRenderer.java +++ b/src/jalview/renderer/AnnotationRenderer.java @@ -20,34 +20,43 @@ */ package jalview.renderer; +import java.awt.BasicStroke; +import java.awt.Color; +import java.awt.Font; +import java.awt.FontMetrics; +import java.awt.Graphics; +import java.awt.Graphics2D; +import java.awt.Image; +import java.awt.RenderingHints; +import java.awt.Stroke; +import java.awt.geom.AffineTransform; +import java.awt.image.ImageObserver; +import java.util.BitSet; +import java.util.Hashtable; + +import org.jfree.graphics2d.svg.SVGGraphics2D; +import org.jibble.epsgraphics.EpsGraphics2D; + import jalview.analysis.AAFrequency; import jalview.analysis.CodingUtils; import jalview.analysis.Rna; import jalview.analysis.StructureFrequency; import jalview.api.AlignViewportI; +import jalview.bin.Cache; +import jalview.bin.Console; import jalview.datamodel.AlignmentAnnotation; import jalview.datamodel.Annotation; import jalview.datamodel.ColumnSelection; import jalview.datamodel.HiddenColumns; import jalview.datamodel.ProfilesI; +import jalview.renderer.api.AnnotationRendererFactoryI; +import jalview.renderer.api.AnnotationRowRendererI; import jalview.schemes.ColourSchemeI; import jalview.schemes.NucleotideColourScheme; import jalview.schemes.ResidueProperties; import jalview.schemes.ZappoColourScheme; import jalview.util.Platform; -import java.awt.BasicStroke; -import java.awt.Color; -import java.awt.Font; -import java.awt.FontMetrics; -import java.awt.Graphics; -import java.awt.Graphics2D; -import java.awt.Image; -import java.awt.geom.AffineTransform; -import java.awt.image.ImageObserver; -import java.util.BitSet; -import java.util.Hashtable; - public class AnnotationRenderer { private static final int UPPER_TO_LOWER = 'a' - 'A'; // 32 @@ -80,12 +89,16 @@ public class AnnotationRenderer private ProfilesI hconsensus; - private Hashtable[] complementConsensus; + private Hashtable[] complementConsensus; - private Hashtable[] hStrucConsensus; + private Hashtable[] hStrucConsensus; private boolean av_ignoreGapsConsensus; + private boolean vectorRendition = false; + + private boolean glyphLineDrawn = false; + /** * attributes set from AwtRenderPanelI */ @@ -149,11 +162,13 @@ public class AnnotationRenderer */ public void dispose() { + hiddenColumns = null; hconsensus = null; complementConsensus = null; hStrucConsensus = null; fadedImage = null; annotationPanel = null; + rendererFactoryI = null; } void drawStemAnnot(Graphics g, Annotation[] row_annotations, int lastSSX, @@ -185,7 +200,7 @@ public class AnnotationRenderer * if new annotation with a closing base pair half of the stem, * display a backward arrow */ - g.fillPolygon(new int[] { lastSSX + 5, lastSSX + 5, lastSSX }, + fillPolygon(g, new int[] { lastSSX + 5, lastSSX + 5, lastSSX }, new int[] { y + iconOffset, y + 14 + iconOffset, y + 8 + iconOffset }, 3); @@ -205,7 +220,7 @@ public class AnnotationRenderer * if annotation ending with an opeing base pair half of the stem, * display a forward arrow */ - g.fillPolygon(new int[] { x2 - 5, x2 - 5, x2 }, + fillPolygon(g, new int[] { x2 - 5, x2 - 5, x2 }, new int[] { y + iconOffset, y + 14 + iconOffset, y + 8 + iconOffset }, 3); @@ -217,7 +232,7 @@ public class AnnotationRenderer } } // draw arrow body - g.fillRect(x1, y + 4 + iconOffset, x2 - x1, 7); + fillRect(g, x1, y + 4 + iconOffset, x2 - x1, 7); } void drawNotCanonicalAnnot(Graphics g, Color nonCanColor, @@ -225,9 +240,8 @@ public class AnnotationRenderer int iconOffset, int startRes, int column, boolean validRes, boolean validEnd) { - // System.out.println(nonCanColor); + // Console.info(nonCanColor); - g.setColor(nonCanColor); int sCol = (lastSSX / charWidth) + hiddenColumns.visibleToAbsoluteColumn(startRes); int x1 = lastSSX; @@ -241,9 +255,16 @@ public class AnnotationRenderer boolean diffdownstream = !validRes || !validEnd || row_annotations[column] == null || !dc.equals(row_annotations[column].displayCharacter); - // System.out.println("Column "+column+" diff up: "+diffupstream+" + // Console.info("Column "+column+" diff up: + // "+diffupstream+" // down:"+diffdownstream); // If a closing base pair half of the stem, display a backward arrow + if (diffupstream || diffdownstream) + { + // draw glyphline under arrow + drawGlyphLine(g, lastSSX, x, y, iconOffset); + } + g.setColor(nonCanColor); if (column > 0 && Rna.isClosingParenthesis(dc)) { @@ -251,9 +272,10 @@ public class AnnotationRenderer // if (validRes && column>1 && row_annotations[column-2]!=null && // dc.equals(row_annotations[column-2].displayCharacter)) { - g.fillPolygon(new int[] { lastSSX + 5, lastSSX + 5, lastSSX }, + fillPolygon(g, new int[] { lastSSX + 5, lastSSX + 5, lastSSX }, new int[] - { y + iconOffset, y + 14 + iconOffset, y + 8 + iconOffset }, + { y + iconOffset + 1, y + 13 + iconOffset, + y + 7 + iconOffset }, 3); x1 += 5; } @@ -268,9 +290,10 @@ public class AnnotationRenderer // display a forward arrow if (diffdownstream) { - g.fillPolygon(new int[] { x2 - 5, x2 - 5, x2 }, + fillPolygon(g, new int[] { x2 - 6, x2 - 6, x2 - 1 }, new int[] - { y + iconOffset, y + 14 + iconOffset, y + 8 + iconOffset }, + { y + iconOffset + 1, y + 13 + iconOffset, + y + 7 + iconOffset }, 3); x2 -= 5; } @@ -280,7 +303,8 @@ public class AnnotationRenderer } } // draw arrow body - g.fillRect(x1, y + 4 + iconOffset, x2 - x1, 7); + unsetAntialias(g); + fillRect(g, x1, y + 4 + iconOffset, x2 - x1, 6); } // public void updateFromAnnotationPanel(FontMetrics annotFM, AlignViewportI @@ -312,6 +336,7 @@ public class AnnotationRenderer useClip = false; } + rendererFactoryI = AnnotationRendererFactory.getRendererFactory(); updateFromAlignViewport(av); } @@ -416,6 +441,10 @@ public class AnnotationRenderer return null; } + boolean rna = false; + + private AnnotationRendererFactoryI rendererFactoryI; + /** * Render the annotation rows associated with an alignment. * @@ -438,6 +467,12 @@ public class AnnotationRenderer AlignViewportI av, Graphics g, int activeRow, int startRes, int endRes) { + if (g instanceof EpsGraphics2D || g instanceof SVGGraphics2D) + { + this.setVectorRendition(true); + } + Graphics2D g2d = (Graphics2D) g; + long stime = System.currentTimeMillis(); boolean usedFaded = false; // NOTES: @@ -446,7 +481,7 @@ public class AnnotationRenderer updateFromAwtRenderPanel(annotPanel, av); fm = g.getFontMetrics(); AlignmentAnnotation[] aa = av.getAlignment().getAlignmentAnnotation(); - int temp = 0; + // int temp = 0; if (aa == null) { return false; @@ -459,8 +494,8 @@ public class AnnotationRenderer boolean validRes = false; boolean validEnd = false; boolean labelAllCols = false; - boolean centreColLabels; - boolean centreColLabelsDef = av.isCentreColumnLabels(); + // boolean centreColLabels; + // boolean centreColLabelsDef = av.isCentreColumnLabels(); boolean scaleColLabel = false; final AlignmentAnnotation consensusAnnot = av .getAlignmentConsensusAnnotation(); @@ -506,7 +541,7 @@ public class AnnotationRenderer { continue; } - centreColLabels = row.centreColLabels || centreColLabelsDef; + // centreColLabels = row.centreColLabels || centreColLabelsDef; labelAllCols = row.showAllColLabels; scaleColLabel = row.scaleColLabel; lastSS = ' '; @@ -583,9 +618,13 @@ public class AnnotationRenderer * * continue; } */ + // first pass sets up state for drawing continuation from left-hand // column // of startRes + + // flag used for vector rendition + this.glyphLineDrawn = false; x = (startRes == 0) ? 0 : -1; while (x < endRes - startRes) { @@ -617,6 +656,7 @@ public class AnnotationRenderer : null; if (x > -1) { + unsetAntialias(g); if (activeRow == i) { g.setColor(Color.red); @@ -625,24 +665,24 @@ public class AnnotationRenderer { if (columnSelection.contains(column)) { - g.fillRect(x * charWidth, y, charWidth, charHeight); + fillRect(g, x * charWidth, y, charWidth, charHeight); } } } if (row.getInvalidStrucPos() > x) { g.setColor(Color.orange); - g.fillRect(x * charWidth, y, charWidth, charHeight); + fillRect(g, x * charWidth, y, charWidth, charHeight); } else if (row.getInvalidStrucPos() == x) { g.setColor(Color.orange.darker()); - g.fillRect(x * charWidth, y, charWidth, charHeight); + fillRect(g, x * charWidth, y, charWidth, charHeight); } if (validCharWidth && validRes && displayChar != null && (displayChar.length() > 0)) { - Graphics2D gg = ((Graphics2D) g); + // Graphics2D gg = (g); float fmWidth = fm.charsWidth(displayChar.toCharArray(), 0, displayChar.length()); @@ -665,11 +705,11 @@ public class AnnotationRenderer if (row_annotations[column].colour == null) { - gg.setColor(Color.black); + g2d.setColor(Color.black); } else { - gg.setColor(row_annotations[column].colour); + g2d.setColor(row_annotations[column].colour); } /* @@ -682,19 +722,20 @@ public class AnnotationRenderer /* * translate to drawing position _before_ applying any scaling */ - gg.translate(xPos, yPos); + g2d.translate(xPos, yPos); if (scaledToFit) { /* * use a scaling transform to make the label narrower * (JalviewJS doesn't have Font.deriveFont(AffineTransform)) */ - gg.transform( + g2d.transform( AffineTransform.getScaleInstance(fmScaling, 1.0)); } + setAntialias(g); if (column == 0 || row.graph > 0) { - gg.drawString(displayChar, 0, 0); + g2d.drawString(displayChar, 0, 0); } else if (row_annotations[column - 1] == null || (labelAllCols || !displayChar.equals( @@ -702,7 +743,7 @@ public class AnnotationRenderer || (displayChar.length() < 2 && row_annotations[column].secondaryStructure == ' '))) { - gg.drawString(displayChar, 0, 0); + g2d.drawString(displayChar, 0, 0); } if (scaledToFit) { @@ -710,10 +751,10 @@ public class AnnotationRenderer * undo scaling before translating back * (restoring saved transform does NOT work in JS PDFGraphics!) */ - gg.transform(AffineTransform + g2d.transform(AffineTransform .getScaleInstance(1D / fmScaling, 1.0)); } - gg.translate(-xPos, -yPos); + g2d.translate(-xPos, -yPos); } } if (row.hasIcons) @@ -774,8 +815,9 @@ public class AnnotationRenderer if (x > -1) { - int nb_annot = x - temp; - // System.out.println("\t type :"+lastSS+"\t x :"+x+"\t nbre + // int nb_annot = x - temp; + // Console.info("\t type :"+lastSS+"\t x + // :"+x+"\t nbre // annot :"+nb_annot); switch (lastSS) { @@ -783,7 +825,7 @@ public class AnnotationRenderer case ')': // and opposite direction drawStemAnnot(g, row_annotations, lastSSX, x, y, iconOffset, startRes, column, validRes, validEnd); - temp = x; + // temp = x; break; case 'H': @@ -866,13 +908,20 @@ public class AnnotationRenderer drawNotCanonicalAnnot(g, nonCanColor, row_annotations, lastSSX, x, y, iconOffset, startRes, column, validRes, validEnd); - temp = x; + // temp = x; break; default: - g.setColor(Color.gray); - g.fillRect(lastSSX, y + 6 + iconOffset, - (x * charWidth) - lastSSX, 2); - temp = x; + if (isVectorRendition()) + { + // draw single full width glyphline + drawGlyphLine(g, lastSSX, endRes - x, y, iconOffset); + // disable more glyph lines + this.glyphLineDrawn = true; + } + else + { + drawGlyphLine(g, lastSSX, x, y, iconOffset); + } break; } } @@ -997,14 +1046,23 @@ public class AnnotationRenderer case 'y': case 'Z': case 'z': - // System.out.println(lastSS); + // Console.info(lastSS); Color nonCanColor = getNotCanonicalColor(lastSS); drawNotCanonicalAnnot(g, nonCanColor, row_annotations, lastSSX, x, y, iconOffset, startRes, column, validRes, validEnd); break; default: - drawGlyphLine(g, row_annotations, lastSSX, x, y, iconOffset, - startRes, column, validRes, validEnd); + if (isVectorRendition()) + { + // draw single full width glyphline + drawGlyphLine(g, lastSSX, endRes - x, y, iconOffset); + // disable more glyph lines + this.glyphLineDrawn = true; + } + else + { + drawGlyphLine(g, lastSSX, x, y, iconOffset); + } break; } } @@ -1062,6 +1120,32 @@ public class AnnotationRenderer row.graphMin, row.graphMax, y, renderHistogram, renderProfile, normaliseProfile); } + else + { + AnnotationRowRendererI renderer = rendererFactoryI + .getRendererFor(row); + if (renderer != null) + { + renderer.renderRow(g, charWidth, charHeight, hasHiddenColumns, + av, hiddenColumns, columnSelection, row, + row_annotations, startRes, endRes, row.graphMin, + row.graphMax, y); + } + if (debugRedraw) + { + if (renderer == null) + { + System.err + .println("No renderer found for " + row.toString()); + } + else + { + Console.warn( + "rendered with " + renderer.getClass().toString()); + } + } + + } } } else @@ -1087,17 +1171,15 @@ public class AnnotationRenderer { if (clipst) { - System.err.println( - "Start clip at : " + yfrom + " (index " + f_i + ")"); + Console.warn("Start clip at : " + yfrom + " (index " + f_i + ")"); } if (clipend) { - System.err.println( - "End clip at : " + yto + " (index " + f_to + ")"); + Console.warn("End clip at : " + yto + " (index " + f_to + ")"); } } ; - System.err.println("Annotation Rendering time:" + Console.warn("Annotation Rendering time:" + (System.currentTimeMillis() - stime)); } ; @@ -1113,12 +1195,17 @@ public class AnnotationRenderer public static final Color STEM_COLOUR = Color.blue; - private Color sdNOTCANONICAL_COLOUR; + // private Color sdNOTCANONICAL_COLOUR; - void drawGlyphLine(Graphics g, Annotation[] row, int lastSSX, int x, - int y, int iconOffset, int startRes, int column, boolean validRes, - boolean validEnd) + void drawGlyphLine(Graphics g, int lastSSX, int x, int y, int iconOffset) { + if (glyphLineDrawn) + { + // if we've drawn a single long glyphline for an export, don't draw the + // bits + return; + } + unsetAntialias(g); g.setColor(GLYPHLINE_COLOR); g.fillRect(lastSSX, y + 6 + iconOffset, (x * charWidth) - lastSSX, 2); } @@ -1128,45 +1215,52 @@ public class AnnotationRenderer int lastSSX, int x, int y, int iconOffset, int startRes, int column, boolean validRes, boolean validEnd) { - g.setColor(SHEET_COLOUR); - if (!validEnd || !validRes || row == null || row[column] == null || row[column].secondaryStructure != 'E') { - g.fillRect(lastSSX, y + 4 + iconOffset, (x * charWidth) - lastSSX - 4, - 7); - g.fillPolygon( + // draw the glyphline underneath + drawGlyphLine(g, lastSSX, x, y, iconOffset); + + g.setColor(SHEET_COLOUR); + fillRect(g, lastSSX, y + 4 + iconOffset, + (x * charWidth) - lastSSX - 4, 6); + fillPolygon(g, new int[] - { (x * charWidth) - 4, (x * charWidth) - 4, (x * charWidth) }, + { (x * charWidth) - 6, (x * charWidth) - 6, + (x * charWidth - 1) }, new int[] - { y + iconOffset, y + 14 + iconOffset, y + 7 + iconOffset }, + { y + iconOffset + 1, y + 13 + iconOffset, + y + 7 + iconOffset }, 3); } else { - g.fillRect(lastSSX, y + 4 + iconOffset, (x + 1) * charWidth - lastSSX, - 7); + g.setColor(SHEET_COLOUR); + fillRect(g, lastSSX, y + 4 + iconOffset, (x * charWidth) - lastSSX, + 6); } - } void drawHelixAnnot(Graphics g, Annotation[] row, int lastSSX, int x, int y, int iconOffset, int startRes, int column, boolean validRes, boolean validEnd) { - g.setColor(HELIX_COLOUR); - int sCol = (lastSSX / charWidth) + hiddenColumns.visibleToAbsoluteColumn(startRes); int x1 = lastSSX; int x2 = (x * charWidth); - if (USE_FILL_ROUND_RECT) + if (USE_FILL_ROUND_RECT || isVectorRendition()) { + // draw glyph line behind helix (visible in EPS or SVG output) + drawGlyphLine(g, lastSSX, x, y, iconOffset); + + g.setColor(HELIX_COLOUR); + setAntialias(g); int ofs = charWidth / 2; // Off by 1 offset when drawing rects and ovals // to offscreen image on the MAC - g.fillRoundRect(lastSSX, y + 4 + iconOffset, x2 - x1, 8, 8, 8); + fillRoundRect(g, lastSSX, y + 3 + iconOffset, x2 - x1 - 1, 8, 8, 8); if (sCol == 0 || row[sCol - 1] == null || row[sCol - 1].secondaryStructure != 'H') { @@ -1174,8 +1268,8 @@ public class AnnotationRenderer else { // g.setColor(Color.orange); - g.fillRoundRect(lastSSX, y + 4 + iconOffset, x2 - x1 - ofs + 1, 8, - 0, 0); + fillRoundRect(g, lastSSX, y + 3 + iconOffset, x2 - x1 - ofs, 8, 0, + 0); } if (!validRes || row[column] == null || row[column].secondaryStructure != 'H') @@ -1185,30 +1279,38 @@ public class AnnotationRenderer else { // g.setColor(Color.magenta); - g.fillRoundRect(lastSSX + ofs, y + 4 + iconOffset, - x2 - x1 - ofs + 1, 8, 0, 0); - + fillRoundRect(g, lastSSX + ofs, y + 3 + iconOffset, x2 - x1 - ofs, + 8, 0, 0); } return; } - if (sCol == 0 || row[sCol - 1] == null - || row[sCol - 1].secondaryStructure != 'H') + boolean leftEnd = sCol == 0 || row[sCol - 1] == null + || row[sCol - 1].secondaryStructure != 'H'; + boolean rightEnd = !validRes || row[column] == null + || row[column].secondaryStructure != 'H'; + + if (leftEnd || rightEnd) { - g.fillArc(lastSSX, y + 4 + iconOffset, charWidth, 8, 90, 180); + drawGlyphLine(g, lastSSX, x, y, iconOffset); + } + g.setColor(HELIX_COLOUR); + + if (leftEnd) + { + fillArc(g, lastSSX, y + 3 + iconOffset, charWidth, 8, 90, 180); x1 += charWidth / 2; } - if (!validRes || row[column] == null - || row[column].secondaryStructure != 'H') + if (rightEnd) { - g.fillArc((x * charWidth) - charWidth, y + 4 + iconOffset, charWidth, - 8, 270, 180); + fillArc(g, ((x - 1) * charWidth), y + 3 + iconOffset, charWidth, 8, + 270, 180); x2 -= charWidth / 2; } - g.fillRect(x1, y + 4 + iconOffset, x2 - x1, 8); + fillRect(g, x1, y + 3 + iconOffset, x2 - x1, 8); } void drawLineGraph(Graphics g, AlignmentAnnotation _aa, @@ -1219,6 +1321,13 @@ public class AnnotationRenderer { return; } + Stroke roundStroke = new BasicStroke(1, BasicStroke.CAP_ROUND, + BasicStroke.JOIN_ROUND); + Stroke squareStroke = new BasicStroke(1, BasicStroke.CAP_SQUARE, + BasicStroke.JOIN_MITER); + Graphics2D g2d = (Graphics2D) g; + Stroke prevStroke = g2d.getStroke(); + g2d.setStroke(roundStroke); int x = 0; @@ -1245,7 +1354,8 @@ public class AnnotationRenderer } g.setColor(Color.gray); - g.drawLine(x - charWidth, y2, (eRes - sRes + 1) * charWidth, y2); + drawLine(g, squareStroke, x * charWidth - charWidth, y2, + (eRes - sRes) * charWidth, y2); eRes = Math.min(eRes, aa_annotations.length); @@ -1265,8 +1375,7 @@ public class AnnotationRenderer break; } - if (aa_annotations[column] == null - || aa_annotations[column - 1] == null) + if (aa_annotations[column] == null) { x++; continue; @@ -1281,12 +1390,31 @@ public class AnnotationRenderer g.setColor(aa_annotations[column].colour); } + if (aa_annotations[column - 1] == null + && aa_annotations.length > column + 1 + && aa_annotations[column + 1] == null) + { + // standalone value + y1 = y - (int) (((aa_annotations[column].value - min) / range) + * graphHeight); + drawLine(g, x * charWidth + charWidth / 4, y1, + x * charWidth + 3 * charWidth / 4, y1); + x++; + continue; + } + + if (aa_annotations[column - 1] == null) + { + x++; + continue; + } + y1 = y - (int) (((aa_annotations[column - 1].value - min) / range) * graphHeight); y2 = y - (int) (((aa_annotations[column].value - min) / range) * graphHeight); - g.drawLine(x * charWidth - charWidth / 2, y1, + drawLine(g, (x - 1) * charWidth + charWidth / 2, y1, x * charWidth + charWidth / 2, y2); x++; } @@ -1295,14 +1423,14 @@ public class AnnotationRenderer { g.setColor(_aa.threshold.colour); Graphics2D g2 = (Graphics2D) g; - g2.setStroke(new BasicStroke(1, BasicStroke.CAP_SQUARE, + Stroke s = 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) * graphHeight); - g.drawLine(0, y2, (eRes - sRes) * charWidth, y2); - g2.setStroke(new BasicStroke()); + drawLine(g, s, 0, y2, (eRes - sRes) * charWidth, y2); } + g2d.setStroke(prevStroke); } @SuppressWarnings("unused") @@ -1329,7 +1457,7 @@ public class AnnotationRenderer g.setColor(Color.gray); - g.drawLine(x, y2, (eRes - sRes) * charWidth, y2); + drawLine(g, x, y2, (eRes - sRes) * charWidth, y2); int column; int aaMax = aa_annotations.length - 1; @@ -1367,11 +1495,11 @@ public class AnnotationRenderer { if (y1 - y2 > 0) { - g.fillRect(x * charWidth, y2, charWidth, y1 - y2); + fillRect(g, x * charWidth, y2, charWidth, y1 - y2); } else { - g.fillRect(x * charWidth, y1, charWidth, y2 - y1); + fillRect(g, x * charWidth, y1, charWidth, y2 - y1); } } // draw profile if available @@ -1402,7 +1530,8 @@ public class AnnotationRenderer // lm is not necessary - we can just use fm - could be off by no more // than 0.5 px // LineMetrics lm = g.getFontMetrics(ofont).getLineMetrics("Q", g); - // System.out.println(asc + " " + dec + " " + (asc - lm.getAscent()) + // Console.info(asc + " " + dec + " " + (asc - + // lm.getAscent()) // + " " + (dec - lm.getDescent())); double asc = fm.getAscent(); @@ -1515,6 +1644,8 @@ public class AnnotationRenderer .deriveFont(AffineTransform.getScaleInstance(sx, sy)); g.setFont(font); g.drawChars(dc, 0, dc.length, x * charWidth, hght); + g.setFont(ofont); + ht += newHeight; } } @@ -1525,15 +1656,13 @@ public class AnnotationRenderer if (_aa.threshold != null) { g.setColor(_aa.threshold.colour); - Graphics2D g2 = (Graphics2D) g; - g2.setStroke(new BasicStroke(1, BasicStroke.CAP_SQUARE, + Stroke s = 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); - g.drawLine(0, y2, (eRes - sRes) * charWidth, y2); - g2.setStroke(new BasicStroke()); + drawLine(g, s, 0, y2, (eRes - sRes) * charWidth, y2); } } @@ -1543,7 +1672,7 @@ public class AnnotationRenderer { eRes = Math.min(eRes, aa_annotations.length); g.setColor(Color.white); - g.fillRect(0, 0, width, y); + fillRect(g, 0, 0, width, y); g.setColor(new Color(0, 0, 180)); int x = 0, height; @@ -1567,7 +1696,7 @@ public class AnnotationRenderer height = y; } - g.fillRect(x, y - height, charWidth, height); + fillRect(g, x, y - height, charWidth, height); } x += charWidth; } @@ -1694,9 +1823,92 @@ public class AnnotationRenderer return new Color(0, 80, 255); default: - System.out.println("This is not a interaction : " + lastss); + Console.info("This is not a interaction : " + lastss); return null; } } + + private void fillPolygon(Graphics g, int[] xpoints, int[] ypoints, int n) + { + setAntialias(g); + g.fillPolygon(xpoints, ypoints, n); + } + + /* + private void fillRect(Graphics g, int a, int b, int c, int d) + { + fillRect(g, false, a, b, c, d); + }*/ + + private void fillRect(Graphics g, int a, int b, int c, int d) + { + unsetAntialias(g); + g.fillRect(a, b, c, d); + } + + private void fillRoundRect(Graphics g, int a, int b, int c, int d, int e, + int f) + { + setAntialias(g); + g.fillRoundRect(a, b, c, d, e, f); + } + + private void fillArc(Graphics g, int a, int b, int c, int d, int e, int f) + { + setAntialias(g); + g.fillArc(a, b, c, d, e, f); + } + + private void drawLine(Graphics g, Stroke s, int a, int b, int c, int d) + { + Graphics2D g2d = (Graphics2D) g; + Stroke p = g2d.getStroke(); + g2d.setStroke(s); + drawLine(g, a, b, c, d); + g2d.setStroke(p); + } + + private void drawLine(Graphics g, int a, int b, int c, int d) + { + setAntialias(g); + g.drawLine(a, b, c, d); + } + + private void setAntialias(Graphics g) + { + if (isVectorRendition()) + { + // no need to antialias vector drawings + return; + } + if (Cache.getDefault("ANTI_ALIAS", true)) + { + Graphics2D g2d = (Graphics2D) g; + g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, + RenderingHints.VALUE_ANTIALIAS_ON); + } + } + + private void unsetAntialias(Graphics g) + { + if (isVectorRendition()) + { + // no need to antialias vector drawings + return; + } + Graphics2D g2d = (Graphics2D) g; + g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, + RenderingHints.VALUE_ANTIALIAS_OFF); + } + + public void setVectorRendition(boolean b) + { + vectorRendition = b; + } + + public boolean isVectorRendition() + { + return vectorRendition; + } }