X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fappletgui%2FIdCanvas.java;h=8f8ed35a1bc4a72aa3f6bb127e982cbe13dc603b;hb=571d15a897c11bdc2dda76ce03686604596f220d;hp=58a4f107519548f27d3e5398983a05484f67f677;hpb=17e77c3f2949a0729322b4a8d907f3f34b6a9914;p=jalview.git diff --git a/src/jalview/appletgui/IdCanvas.java b/src/jalview/appletgui/IdCanvas.java index 58a4f10..8f8ed35 100755 --- a/src/jalview/appletgui/IdCanvas.java +++ b/src/jalview/appletgui/IdCanvas.java @@ -1,6 +1,6 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9) - * Copyright (C) 2015 The Jalview Authors + * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$) + * Copyright (C) $$Year-Rel$$ The Jalview Authors * * This file is part of Jalview. * @@ -106,13 +106,14 @@ public class IdCanvas extends Panel gg.copyArea(0, 0, getSize().width, imgHeight, 0, -vertical * av.getCharHeight()); - int ss = av.startSeq, es = av.endSeq, transY = 0; + int ss = av.getStartSeq(), es = av.getEndSeq(), transY = 0; if (vertical > 0) // scroll down { ss = es - vertical; - if (ss < av.startSeq) // ie scrolling too fast, more than a page at a time + if (ss < av.getStartSeq()) // ie scrolling too fast, more than a page at a + // time { - ss = av.startSeq; + ss = av.getStartSeq(); } else { @@ -122,9 +123,9 @@ public class IdCanvas extends Panel else if (vertical < 0) { es = ss - vertical; - if (es > av.endSeq) + if (es > av.getEndSeq()) { - es = av.endSeq; + es = av.getEndSeq(); } } @@ -138,11 +139,13 @@ public class IdCanvas extends Panel repaint(); } + @Override public void update(Graphics g) { paint(g); } + @Override public void paint(Graphics g) { if (getSize().height < 0 || getSize().width < 0) @@ -178,7 +181,7 @@ public class IdCanvas extends Panel gg.setFont(italic); gg.fillRect(0, 0, getSize().width, getSize().height); - drawIds(av.startSeq, av.endSeq); + drawIds(av.getStartSeq(), av.getEndSeq()); g.drawImage(image, 0, 0, this); } @@ -233,7 +236,7 @@ public class IdCanvas extends Panel int rowSize = av.getEndRes() - av.getStartRes(); // Draw the rest of the panels - for (int ypos = hgap, row = av.startRes; (ypos <= getSize().height) + for (int ypos = hgap, row = av.getStartRes(); (ypos <= getSize().height) && (row < maxwidth); ypos += cHeight, row += rowSize) { for (int i = starty; i < alheight; i++) @@ -378,7 +381,7 @@ public class IdCanvas extends Panel Font bold = new Font(av.getFont().getName(), Font.BOLD, av.getFont() .getSize()); - if (av.isHiddenRepSequence(seq)) + if (av.isReferenceSeq(seq) || av.isHiddenRepSequence(seq)) { gg.setFont(bold); return true;