Show labels in wrapped view

[jalview.git] / src / jalview / gui / AnnotationLabels.java

diff --git a/src/jalview/gui/AnnotationLabels.java b/src/jalview/gui/AnnotationLabels.java
index 7c8850d..8561e64 100755 (executable)
--- a/src/jalview/gui/AnnotationLabels.java
+++ b/src/jalview/gui/AnnotationLabels.java
@@ -44,12 +44,14 @@ public class AnnotationLabels extends JPanel implements MouseListener,
     boolean active = false;\r
     Image image;\r
     AlignmentPanel ap;\r
+    AlignViewport av;\r
     boolean resizing = false;\r
     int oldY;\r
     int mouseX;\r
     int selectedRow = 0;\r
     int scrollOffset = 0;\r
 \r
+\r
     /**\r
      * Creates a new AnnotationLabels object.\r
      *\r
@@ -58,6 +60,7 @@ public class AnnotationLabels extends JPanel implements MouseListener,
     public AnnotationLabels(AlignmentPanel ap)\r
     {\r
         this.ap = ap;\r
+        av = ap.av;\r
 \r
         java.net.URL url = getClass().getResource("/images/idwidth.gif");\r
         Image temp = null;\r
@@ -88,6 +91,11 @@ public class AnnotationLabels extends JPanel implements MouseListener,
         addMouseMotionListener(this);\r
     }\r
 \r
+    public AnnotationLabels(AlignViewport av)\r
+    {\r
+      this.av = av;\r
+    }\r
+\r
     /**\r
      * DOCUMENT ME!\r
      *\r
@@ -346,13 +354,19 @@ public class AnnotationLabels extends JPanel implements MouseListener,
      *\r
      * @param g1 DOCUMENT ME!\r
      */\r
-    public void paintComponent(Graphics g1)\r
+    public void paintComponent(Graphics g)\r
     {\r
-        Graphics2D g = (Graphics2D) g1;\r
-        g.setRenderingHint(RenderingHints.KEY_ANTIALIASING,\r
+\r
+        int width = getWidth();\r
+        if(width==0)\r
+         width = ap.calculateIdWidth().width + 4;\r
+\r
+       Graphics2D g2 = (Graphics2D) g;\r
+        g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING,\r
             RenderingHints.VALUE_ANTIALIAS_ON);\r
 \r
-        drawComponent(g);\r
+       drawComponent(g2, width);\r
+\r
     }\r
 \r
     /**\r
@@ -360,7 +374,7 @@ public class AnnotationLabels extends JPanel implements MouseListener,
      *\r
      * @param g DOCUMENT ME!\r
      */\r
-    public void drawComponent(Graphics2D g)\r
+    public void drawComponent(Graphics g, int width)\r
     {\r
         FontMetrics fm = g.getFontMetrics(g.getFont());\r
         g.setColor(Color.white);\r
@@ -369,12 +383,10 @@ public class AnnotationLabels extends JPanel implements MouseListener,
         g.translate(0, scrollOffset);\r
         g.setColor(Color.black);\r
 \r
-        AlignmentAnnotation[] aa = ap.av.alignment.getAlignmentAnnotation();\r
+        AlignmentAnnotation[] aa = av.alignment.getAlignmentAnnotation();\r
         int y = g.getFont().getSize();\r
         int x = 0;\r
-        int width = getWidth();\r
-        if(width==0)\r
-         width = ap.calculateIdWidth().width + 4;\r
+\r
 \r
         if (aa != null)\r
         {\r