*/\r
package jalview.gui;\r
\r
-import jalview.analysis.*;\r
-\r
import jalview.datamodel.*;\r
\r
import java.awt.*;\r
gg.setColor(Color.black);\r
}\r
\r
- String string = s.getName();\r
-\r
- if (av.getShowFullId())\r
- {\r
- string = s.getDisplayId();\r
- }\r
\r
- gg.drawString(string, 0,\r
- (((i - starty + 1) * charHeight) + ypos) - (charHeight / 5));\r
+ gg.drawString( s.getDisplayId(av.getShowDBPrefix(), av.getShowJVSuffix()),\r
+ 0, (((i - starty + 1) * charHeight) + ypos) - (charHeight / 5));\r
}\r
\r
/**\r
//Fill in the background\r
gg.setColor(Color.white);\r
gg.fillRect(0, 0, getWidth(), imgHeight);\r
- gg.setRenderingHint(RenderingHints.KEY_ANTIALIASING,\r
- RenderingHints.VALUE_ANTIALIAS_ON);\r
\r
- Font italic = new Font(av.getFont().getName(), Font.ITALIC,\r
- av.getFont().getSize());\r
- gg.setFont(italic);\r
\r
drawIds(av.getStartSeq(), av.endSeq);\r
\r
*/\r
void drawIds(int starty, int endy)\r
{\r
+ Font italic = new Font(av.getFont().getName(), Font.ITALIC,\r
+ av.getFont().getSize());\r
+ gg.setFont(italic);\r
+ gg.setRenderingHint(RenderingHints.KEY_ANTIALIASING,\r
+ RenderingHints.VALUE_ANTIALIAS_ON);\r
+\r
Color currentColor = Color.white;\r
Color currentTextColor = Color.black;\r
\r
if (av.getWrapAlignment())\r
{\r
int annotationHeight = 0;\r
+ AnnotationLabels labels = null;\r
\r
if(av.showAnnotation)\r
{\r
AnnotationPanel ap = new AnnotationPanel(av);\r
annotationHeight = ap.adjustPanelHeight();\r
+ labels = new AnnotationLabels(av);\r
}\r
\r
int hgap = av.charHeight;\r
SequenceI s = av.alignment.getSequenceAt(i);\r
drawIdString(gg, s, i, 0, ypos);\r
}\r
+\r
+ if(labels!=null)\r
+ {\r
+ gg.setFont(av.getFont());\r
+ gg.translate(0, ypos+(av.getAlignment().getHeight() * av.charHeight));\r
+ labels.drawComponent(gg, getWidth());\r
+ gg.translate(0, -ypos-(av.getAlignment().getHeight() * av.charHeight));\r
+ gg.setFont(italic);\r
+ }\r
}\r
}\r
else\r
\r
gg.setColor(currentTextColor);\r
\r
- String string = av.alignment.getSequenceAt(i).getName();\r
-\r
- if (av.getShowFullId())\r
- {\r
- string = av.alignment.getSequenceAt(i).getDisplayId();\r
- }\r
+ String string = av.alignment.getSequenceAt(i).getDisplayId(\r
+ av.getShowDBPrefix(), av.getShowJVSuffix());\r
\r
gg.drawString(string, 0,\r
(((i - starty) * av.charHeight) + av.charHeight) -\r