X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Frenderer%2FAnnotationRenderer.java;h=ad1fa4ae64eb15056f0060fec2c2b696a3712384;hb=1624d4fc89f17c4a6cdb80b7d4cc37a095b6fe67;hp=7d6b7b8eeb8224207dc01762c00252dfa6338934;hpb=80b889f0cca49103e1b20ed806755a0719789906;p=jalview.git diff --git a/src/jalview/renderer/AnnotationRenderer.java b/src/jalview/renderer/AnnotationRenderer.java index 7d6b7b8..ad1fa4a 100644 --- a/src/jalview/renderer/AnnotationRenderer.java +++ b/src/jalview/renderer/AnnotationRenderer.java @@ -20,6 +20,18 @@ */ 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.geom.AffineTransform; +import java.awt.image.ImageObserver; +import java.util.BitSet; +import java.util.Hashtable; + import jalview.analysis.AAFrequency; import jalview.analysis.CodingUtils; import jalview.analysis.Rna; @@ -38,18 +50,6 @@ 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 @@ -1300,8 +1300,7 @@ public class AnnotationRenderer break; } - if (aa_annotations[column] == null - || aa_annotations[column - 1] == null) + if (aa_annotations[column] == null) { x++; continue; @@ -1316,6 +1315,25 @@ 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); + g.drawLine(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)