X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FIdCanvas.java;h=6810fed9e16f47ff76cbcf78dbf4b3b9d5cd5224;hb=e775f1627590b62ccad7cc5104667d347079497b;hp=91b23e499b6e24e780e79e4f19a57118407f2b7a;hpb=47168f025aefdaa044802bd5f8f510ffe43a4808;p=jalview.git diff --git a/src/jalview/gui/IdCanvas.java b/src/jalview/gui/IdCanvas.java index 91b23e4..6810fed 100755 --- a/src/jalview/gui/IdCanvas.java +++ b/src/jalview/gui/IdCanvas.java @@ -60,7 +60,7 @@ public class IdCanvas extends JPanel AnnotationPanel ap; - Font idfont; + private Font idfont; /** * Creates a new IdCanvas object. @@ -119,7 +119,7 @@ public class IdCanvas extends JPanel gg.setColor(Color.black); } - if (av.rightAlignIds) + if (av.isRightAlignIds()) { xPos = panelWidth - fm.stringWidth(s.getDisplayId(av.getShowJVSuffix())) - 4; @@ -247,15 +247,15 @@ public class IdCanvas extends JPanel { if (av.seqNameItalics) { - idfont = new Font(av.getFont().getName(), Font.ITALIC, av.getFont() - .getSize()); + setIdfont(new Font(av.getFont().getName(), Font.ITALIC, av.getFont() + .getSize())); } else { - idfont = av.getFont(); + setIdfont(av.getFont()); } - gg.setFont(idfont); + gg.setFont(getIdfont()); fm = gg.getFontMetrics(); if (av.antiAlias) @@ -279,7 +279,7 @@ public class IdCanvas extends JPanel int annotationHeight = 0; - if (av.showAnnotation) + if (av.isShowAnnotation()) { if (ap == null) { @@ -316,13 +316,13 @@ public class IdCanvas extends JPanel } else { - gg.setFont(idfont); + gg.setFont(getIdfont()); } drawIdString(gg, s, i, 0, ypos); } - if (labels != null && av.showAnnotation) + if (labels != null && av.isShowAnnotation()) { gg.translate(0, ypos + (alheight * av.charHeight)); labels.drawComponent(gg, getWidth()); @@ -383,7 +383,7 @@ public class IdCanvas extends JPanel String string = sequence.getDisplayId(av.getShowJVSuffix()); - if (av.rightAlignIds) + if (av.isRightAlignIds()) { xPos = panelWidth - fm.stringWidth(string) - 4; } @@ -474,7 +474,7 @@ public class IdCanvas extends JPanel } else { - gg.setFont(idfont); + gg.setFont(getIdfont()); } } @@ -489,4 +489,14 @@ public class IdCanvas extends JPanel searchResults = list; repaint(); } + + public Font getIdfont() + { + return idfont; + } + + public void setIdfont(Font idfont) + { + this.idfont = idfont; + } }