{\r
setLayout(null);\r
this.av = av;\r
- PaintRefresher.Register(this, av.alignment);\r
+ PaintRefresher.Register(this, av.getSequenceSetId());\r
}\r
\r
public void drawIdString(Graphics gg, SequenceI s, int i, int starty,\r
gg.setColor(Color.white);\r
}\r
else if (av.getSelectionGroup() != null &&\r
- av.getSelectionGroup().getSequences(false).contains(s))\r
+ av.getSelectionGroup().getSequences(null).contains(s))\r
{\r
gg.setColor(Color.lightGray);\r
gg.fillRect(0, ((i - starty) * charHeight) + ypos,\r
}\r
else\r
{\r
- gg.setColor(s.getColor());\r
+ gg.setColor(av.getSequenceColour(s));\r
gg.fillRect(0, ((i - starty) * charHeight) + ypos,\r
getSize().width, charHeight);\r
gg.setColor(Color.black);\r
//Now draw the id strings\r
\r
//Now draw the id strings\r
+ SequenceI seq;\r
for (int i = starty; i < endy; i++)\r
{\r
if (av.hasHiddenRows)\r
setHiddenFont(i);\r
}\r
\r
+ seq = av.alignment.getSequenceAt(i);\r
+ if(seq==null)\r
+ continue;\r
+\r
// Selected sequence colours\r
if ( (searchResults != null) &&\r
- searchResults.contains(av.alignment.getSequenceAt(i)))\r
+ searchResults.contains(seq))\r
{\r
currentColor = Color.black;\r
currentTextColor = Color.white;\r
}\r
else if ( (av.getSelectionGroup() != null) &&\r
- av.getSelectionGroup().getSequences(false).contains(\r
- av.alignment.getSequenceAt(i)))\r
+ av.getSelectionGroup().getSequences(null).contains(seq))\r
{\r
currentColor = Color.lightGray;\r
currentTextColor = Color.black;\r
}\r
else\r
{\r
- currentColor = av.alignment.getSequenceAt(i).getColor();\r
+ currentColor = av.getSequenceColour(seq);\r
currentTextColor = Color.black;\r
}\r
\r
\r
gg.setColor(currentTextColor);\r
\r
- String string = av.alignment.getSequenceAt(i).getDisplayId(av.\r
- getShowJVSuffix());\r
\r
- gg.drawString(string, 0,\r
+ gg.drawString(seq.getDisplayId(av.getShowJVSuffix()),\r
+ 0,\r
( ( (i - starty) * av.charHeight) + av.charHeight) -\r
(av.charHeight / 5));\r
\r