X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FIdCanvas.java;h=399506ed1a9f73cc59981bcad81b8ff13cda77dc;hb=0149a3aec3e61c36ee788adfbd53bf560407e1e0;hp=3c3c52c896d2cfabc41ddeb24582c2a34e8d645b;hpb=588042b69abf8e60bcc950b24c283933c7dd422f;p=jalview.git diff --git a/src/jalview/appletgui/IdCanvas.java b/src/jalview/appletgui/IdCanvas.java index 3c3c52c..399506e 100755 --- a/src/jalview/appletgui/IdCanvas.java +++ b/src/jalview/appletgui/IdCanvas.java @@ -44,7 +44,7 @@ public class IdCanvas { setLayout(null); this.av = av; - PaintRefresher.Register(this); + PaintRefresher.Register(this, av.alignment); } public void drawIdString(Graphics gg, SequenceI s, int i, int starty, @@ -55,7 +55,7 @@ public class IdCanvas if (searchResults != null && searchResults.contains(s)) { gg.setColor(Color.black); - gg.fillRect(0, AlignmentUtil.getPixelHeight(starty, i, charHeight) + ypos, + gg.fillRect(0, ((i - starty) * charHeight) + ypos, getSize().width, charHeight); gg.setColor(Color.white); } @@ -63,14 +63,14 @@ public class IdCanvas av.getSelectionGroup().sequences.contains(s)) { gg.setColor(Color.lightGray); - gg.fillRect(0, AlignmentUtil.getPixelHeight(starty, i, charHeight) + ypos, + gg.fillRect(0, ((i - starty) * charHeight) + ypos, getSize().width, charHeight); gg.setColor(Color.white); } else { gg.setColor(s.getColor()); - gg.fillRect(0, AlignmentUtil.getPixelHeight(starty, i, charHeight) + ypos, + gg.fillRect(0, ((i - starty) * charHeight) + ypos, getSize().width, charHeight); gg.setColor(Color.black); } @@ -82,7 +82,7 @@ public class IdCanvas } gg.drawString(string, 0, - AlignmentUtil.getPixelHeight(starty, i, charHeight) + ypos + + ((i - starty) * charHeight) + ypos + charHeight - (charHeight / 5)); } @@ -228,7 +228,7 @@ public class IdCanvas gg.setColor(currentColor); gg.fillRect(0, - AlignmentUtil.getPixelHeight(starty, i, av.charHeight), + ((i - starty) * av.charHeight), getSize().width, av.charHeight); @@ -239,7 +239,7 @@ public class IdCanvas string = av.alignment.getSequenceAt(i).getDisplayId(); } gg.drawString(string, 0, - AlignmentUtil.getPixelHeight(starty, i, av.charHeight) + + ((i - starty) * av.charHeight) + av.charHeight - (av.charHeight / 5)); }