git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
AddToDesktop is synchronized
[jalview.git]
/
src
/
jalview
/
appletgui
/
IdCanvas.java
diff --git
a/src/jalview/appletgui/IdCanvas.java
b/src/jalview/appletgui/IdCanvas.java
index
3c3c52c
..
399506e
100755
(executable)
--- a/
src/jalview/appletgui/IdCanvas.java
+++ b/
src/jalview/appletgui/IdCanvas.java
@@
-44,7
+44,7
@@
public class IdCanvas
{
\r
setLayout(null);
\r
this.av = av;
\r
{
\r
setLayout(null);
\r
this.av = av;
\r
- PaintRefresher.Register(this);
\r
+ PaintRefresher.Register(this, av.alignment);
\r
}
\r
\r
public void drawIdString(Graphics gg, SequenceI s, int i, int starty,
\r
}
\r
\r
public void drawIdString(Graphics gg, SequenceI s, int i, int starty,
\r
@@
-55,7
+55,7
@@
public class IdCanvas
if (searchResults != null && searchResults.contains(s))
\r
{
\r
gg.setColor(Color.black);
\r
if (searchResults != null && searchResults.contains(s))
\r
{
\r
gg.setColor(Color.black);
\r
- gg.fillRect(0, AlignmentUtil.getPixelHeight(starty, i, charHeight) + ypos,
\r
+ gg.fillRect(0, ((i - starty) * charHeight) + ypos,
\r
getSize().width, charHeight);
\r
gg.setColor(Color.white);
\r
}
\r
getSize().width, charHeight);
\r
gg.setColor(Color.white);
\r
}
\r
@@
-63,14
+63,14
@@
public class IdCanvas
av.getSelectionGroup().sequences.contains(s))
\r
{
\r
gg.setColor(Color.lightGray);
\r
av.getSelectionGroup().sequences.contains(s))
\r
{
\r
gg.setColor(Color.lightGray);
\r
- gg.fillRect(0, AlignmentUtil.getPixelHeight(starty, i, charHeight) + ypos,
\r
+ gg.fillRect(0, ((i - starty) * charHeight) + ypos,
\r
getSize().width, charHeight);
\r
gg.setColor(Color.white);
\r
}
\r
else
\r
{
\r
gg.setColor(s.getColor());
\r
getSize().width, charHeight);
\r
gg.setColor(Color.white);
\r
}
\r
else
\r
{
\r
gg.setColor(s.getColor());
\r
- gg.fillRect(0, AlignmentUtil.getPixelHeight(starty, i, charHeight) + ypos,
\r
+ gg.fillRect(0, ((i - starty) * charHeight) + ypos,
\r
getSize().width, charHeight);
\r
gg.setColor(Color.black);
\r
}
\r
getSize().width, charHeight);
\r
gg.setColor(Color.black);
\r
}
\r
@@
-82,7
+82,7
@@
public class IdCanvas
}
\r
\r
gg.drawString(string, 0,
\r
}
\r
\r
gg.drawString(string, 0,
\r
- AlignmentUtil.getPixelHeight(starty, i, charHeight) + ypos +
\r
+ ((i - starty) * charHeight) + ypos +
\r
charHeight - (charHeight / 5));
\r
\r
}
\r
charHeight - (charHeight / 5));
\r
\r
}
\r
@@
-228,7
+228,7
@@
public class IdCanvas
gg.setColor(currentColor);
\r
\r
gg.fillRect(0,
\r
gg.setColor(currentColor);
\r
\r
gg.fillRect(0,
\r
- AlignmentUtil.getPixelHeight(starty, i, av.charHeight),
\r
+ ((i - starty) * av.charHeight),
\r
getSize().width,
\r
av.charHeight);
\r
\r
getSize().width,
\r
av.charHeight);
\r
\r
@@
-239,7
+239,7
@@
public class IdCanvas
string = av.alignment.getSequenceAt(i).getDisplayId();
\r
}
\r
gg.drawString(string, 0,
\r
string = av.alignment.getSequenceAt(i).getDisplayId();
\r
}
\r
gg.drawString(string, 0,
\r
- AlignmentUtil.getPixelHeight(starty, i, av.charHeight) +
\r
+ ((i - starty) * av.charHeight) +
\r
av.charHeight - (av.charHeight / 5));
\r
}
\r
\r
av.charHeight - (av.charHeight / 5));
\r
}
\r
\r