returns to zero degrees when stopped

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

diff --git a/src/jalview/gui/AnnotationLabels.java b/src/jalview/gui/AnnotationLabels.java
index 3bc78be..bffa89a 100755 (executable)
--- a/src/jalview/gui/AnnotationLabels.java
+++ b/src/jalview/gui/AnnotationLabels.java
@@ -50,6 +50,7 @@ public class AnnotationLabels extends JPanel implements MouseListener,
     int mouseX;\r
     int selectedRow = 0;\r
     int scrollOffset = 0;\r
+    Font font = new Font("Arial", Font.PLAIN, 11);\r
 \r
 \r
     /**\r
@@ -127,10 +128,12 @@ public class AnnotationLabels extends JPanel implements MouseListener,
                 label = "";\r
             }\r
 \r
-            ap.av.alignment.addAnnotation(new AlignmentAnnotation(label,\r
+            AlignmentAnnotation newAnnotation = new AlignmentAnnotation(label,\r
                     "New description",\r
-                    new Annotation[ap.av.alignment.getWidth()]));\r
+                    new Annotation[ap.av.alignment.getWidth()]);\r
 \r
+            ap.av.alignment.addAnnotation(newAnnotation);\r
+            ap.av.alignment.setAnnotationIndex(newAnnotation, 0);\r
             dif = aa[aa.length - 1].height;\r
         }\r
         else if (evt.getActionCommand().equals(HIDE))\r
@@ -181,15 +184,8 @@ public class AnnotationLabels extends JPanel implements MouseListener,
 \r
 \r
         ap.annotationPanel.adjustPanelHeight();\r
-\r
-        Dimension d = ap.annotationScroller.getPreferredSize();\r
-        ap.annotationScroller.setPreferredSize(new Dimension(d.width,\r
-                d.height + dif));\r
-        d = ap.annotationSpaceFillerHolder.getPreferredSize();\r
-        ap.annotationSpaceFillerHolder.setPreferredSize(new Dimension(d.width,\r
-                d.height + dif));\r
-\r
-        ap.addNotify();\r
+        ap.annotationScroller.validate();\r
+        ap.repaint();\r
     }\r
 \r
     /**\r
@@ -362,6 +358,7 @@ public class AnnotationLabels extends JPanel implements MouseListener,
          width = ap.calculateIdWidth().width + 4;\r
 \r
        Graphics2D g2 = (Graphics2D) g;\r
+       if(av.antiAlias)\r
         g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING,\r
             RenderingHints.VALUE_ANTIALIAS_ON);\r
 \r
@@ -376,7 +373,11 @@ public class AnnotationLabels extends JPanel implements MouseListener,
      */\r
     public void drawComponent(Graphics g, int width)\r
     {\r
-        g.setFont(new Font("Arial", Font.PLAIN, av.getFont().getSize()-3));\r
+        if(av.getFont().getSize()<10)\r
+          g.setFont(new Font("Arial", Font.PLAIN, av.getFont().getSize()-1));\r
+        else\r
+          g.setFont(font);\r
+\r
         FontMetrics fm = g.getFontMetrics(g.getFont());\r
         g.setColor(Color.white);\r
         g.fillRect(0, 0, getWidth(), getHeight());\r
@@ -385,8 +386,11 @@ public class AnnotationLabels extends JPanel implements MouseListener,
         g.setColor(Color.black);\r
 \r
         AlignmentAnnotation[] aa = av.alignment.getAlignmentAnnotation();\r
-        int y = g.getFont().getSize();\r
+        int fontHeight = g.getFont().getSize();\r
+        int y = fontHeight;\r
         int x = 0;\r
+        int graphExtras = 0;\r
+\r
 \r
 \r
         if (aa != null)\r
@@ -400,15 +404,73 @@ public class AnnotationLabels extends JPanel implements MouseListener,
 \r
                 x = width - fm.stringWidth(aa[i].label) - 3;\r
 \r
-                if (aa[i].isGraph)\r
+                if (aa[i].graph>0)\r
                 {\r
+                    graphExtras = y;\r
+\r
                     y += (aa[i].height / 3);\r
+\r
+                    if(aa[i].graphGroup<0)\r
+                        graphExtras = y + fontHeight;\r
                 }\r
 \r
-                g.drawString(aa[i].label, x, y);\r
+                if(aa[i].graphGroup>-1)\r
+                {\r
+                  int groupSize = 0;\r
+                  for (int gg = 0; gg < aa.length; gg++)\r
+                  {\r
+                    if (aa[gg].graphGroup == aa[i].graphGroup)\r
+                      groupSize++;\r
+                  }\r
+\r
+                  if(groupSize * (fontHeight+8) < aa[i].height)\r
+                    graphExtras += (aa[i].height -( groupSize * (fontHeight+8)) )/2;\r
+\r
+                 for(int gg=0; gg<aa.length; gg++)\r
+                 {\r
+                   if(aa[gg].graphGroup==aa[i].graphGroup)\r
+                   {\r
+                     x = width - fm.stringWidth(aa[gg].label) - 3;\r
+                     g.drawString(aa[gg].label, x, graphExtras );\r
+                     if(aa[gg].annotations[0]!=null)\r
+                       g.setColor(aa[gg].annotations[0].colour);\r
+\r
+                     g.drawLine( x, graphExtras+3,\r
+                                 x+fm.stringWidth(aa[gg].label),\r
+                                 graphExtras+3);\r
+\r
+                     g.setColor(Color.black);\r
+                     graphExtras += fontHeight+8;\r
+                   }\r
+                 }\r
+                }\r
+                else\r
+                  g.drawString(aa[i].label, x, y);\r
 \r
-                if (aa[i].isGraph)\r
+                if (aa[i].graph>0)\r
                 {\r
+                /*  if (aa[i].graphLines != null)\r
+                  {\r
+                    for (int gl = 0; gl < aa[i].graphLines.size(); gl++)\r
+                    {\r
+                       x = width - fm.stringWidth(aa[i].getGraphLine(gl).label) - 3;\r
+                      g.drawString(aa[i].getGraphLine(gl).label, x, graphExtras);\r
+                      g.setColor(aa[i].getGraphLine(gl).colour);\r
+                      Graphics2D g2 = (Graphics2D) g;\r
+                      g2.setStroke(new BasicStroke(1,\r
+                          BasicStroke.CAP_SQUARE,\r
+                          BasicStroke.JOIN_ROUND, 3f,\r
+                          new float[]\r
+                          {5f, 3f}, 0f));\r
+\r
+                      graphExtras += 3;\r
+\r
+                      g.drawLine(x, graphExtras,\r
+                                 x+fm.stringWidth(aa[i].label),\r
+                                 graphExtras);\r
+                      g2.setStroke(new BasicStroke());\r
+                    }\r
+                  }*/\r
                     y += ((2 * aa[i].height) / 3);\r
                 }\r
                 else\r
@@ -422,7 +484,7 @@ public class AnnotationLabels extends JPanel implements MouseListener,
         {\r
             if (image != null)\r
             {\r
-                g.drawImage(image, 2, 0, this);\r
+                g.drawImage(image, 2, 0 - scrollOffset, this);\r
             }\r
         }\r
 \r