X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Frenderer%2FAnnotationRenderer.java;h=9438e9a9b869fd88b50809e11934aa13dadd3c9d;hb=cd669a0e8c7b91b379bca8fe6e702cf0fcbd1ce0;hp=be65eb7760ff803286f59ee13f7581e3ac66c337;hpb=bc7ebbb58133e64e7a77cb83eef8e2df75faec03;p=jalview.git diff --git a/src/jalview/renderer/AnnotationRenderer.java b/src/jalview/renderer/AnnotationRenderer.java index be65eb7..9438e9a 100644 --- a/src/jalview/renderer/AnnotationRenderer.java +++ b/src/jalview/renderer/AnnotationRenderer.java @@ -95,7 +95,7 @@ public class AnnotationRenderer private boolean av_ignoreGapsConsensus; - private boolean vectorRendition = false; + private boolean renderingVectors = false; private boolean glyphLineDrawn = false; @@ -184,7 +184,7 @@ public class AnnotationRenderer : row_annotations[column - 1].secondaryStructure; boolean diffupstream = sCol == 0 || row_annotations[sCol - 1] == null - || dc != row_annotations[sCol - 1].secondaryStructure; + || dc != row_annotations[sCol - 1].secondaryStructure || !validEnd; boolean diffdownstream = !validRes || !validEnd || row_annotations[column] == null || dc != row_annotations[column].secondaryStructure; @@ -260,7 +260,7 @@ public class AnnotationRenderer : row_annotations[column - 1].displayCharacter; boolean diffupstream = sCol == 0 || row_annotations[sCol - 1] == null - || !dc.equals(row_annotations[sCol - 1].displayCharacter); + || !dc.equals(row_annotations[sCol - 1].displayCharacter) || !validEnd; boolean diffdownstream = !validRes || !validEnd || row_annotations[column] == null || !dc.equals(row_annotations[column].displayCharacter); @@ -478,7 +478,7 @@ public class AnnotationRenderer { if (g instanceof EpsGraphics2D || g instanceof SVGGraphics2D) { - this.setVectorRendition(true); + this.setVectorRendering(true); } Graphics2D g2d = (Graphics2D) g; @@ -920,7 +920,7 @@ public class AnnotationRenderer // temp = x; break; default: - if (isVectorRendition()) + if (isVectorRendering()) { // draw single full width glyphline drawGlyphLine(g, lastSSX, endRes - x, y, iconOffset); @@ -1061,7 +1061,7 @@ public class AnnotationRenderer x, y, iconOffset, startRes, column, validRes, validEnd); break; default: - if (isVectorRendition()) + if (isVectorRendering()) { // draw single full width glyphline drawGlyphLine(g, lastSSX, endRes - x, y, iconOffset); @@ -1259,7 +1259,7 @@ public class AnnotationRenderer int x1 = lastSSX; int x2 = (x * charWidth); - if (USE_FILL_ROUND_RECT || isVectorRendition()) + if (USE_FILL_ROUND_RECT || isVectorRendering()) { // draw glyph line behind helix (visible in EPS or SVG output) drawGlyphLine(g, lastSSX, x, y, iconOffset); @@ -1884,7 +1884,7 @@ public class AnnotationRenderer private void setAntialias(Graphics g) { - if (isVectorRendition()) + if (isVectorRendering()) { // no need to antialias vector drawings return; @@ -1899,7 +1899,7 @@ public class AnnotationRenderer private void unsetAntialias(Graphics g) { - if (isVectorRendition()) + if (isVectorRendering()) { // no need to antialias vector drawings return; @@ -1909,13 +1909,13 @@ public class AnnotationRenderer RenderingHints.VALUE_ANTIALIAS_OFF); } - public void setVectorRendition(boolean b) + public void setVectorRendering(boolean b) { - vectorRendition = b; + renderingVectors = b; } - public boolean isVectorRendition() + public boolean isVectorRendering() { - return vectorRendition; + return renderingVectors; } }