Brackets around orgin calculation

diff --git a/src/jalview/appletgui/AnnotationPanel.java b/src/jalview/appletgui/AnnotationPanel.java
index 1bf3d38..71f51ea 100755 (executable)
--- a/src/jalview/appletgui/AnnotationPanel.java
+++ b/src/jalview/appletgui/AnnotationPanel.java
@@ -624,7 +624,7 @@ public class AnnotationPanel
 \r
     ////Draw origin\r
     if(min<0)\r
-      y2 = (int)(y - (0-min / range)*graphHeight);\r
+      y2 = y - (int)((0-min / range)*graphHeight);\r
 \r
     g.setColor(Color.gray);\r
     g.drawLine(x-av.charWidth,y2,(eRes-sRes)*av.charWidth,y2);\r
@@ -672,7 +672,7 @@ public class AnnotationPanel
     y1 = y2 = y;\r
 \r
     if(min<0)\r
-      y2 = (int)(y - (0-min / (range))*aa.graphHeight);\r
+      y2 = y -(int)( (0-min / (range))*aa.graphHeight);\r
 \r
     g.setColor(Color.gray);\r
 \r

diff --git a/src/jalview/gui/AnnotationPanel.java b/src/jalview/gui/AnnotationPanel.java
index fc7232e..add3209 100755 (executable)
--- a/src/jalview/gui/AnnotationPanel.java
+++ b/src/jalview/gui/AnnotationPanel.java
@@ -1018,7 +1018,7 @@ public class AnnotationPanel extends JPanel implements MouseListener,
 \r
       ////Draw origin\r
       if(min<0)\r
-        y2 = (int)(y - (0-min / range)*graphHeight);\r
+        y2 = y - (int)((0-min / range)*graphHeight);\r
 \r
       g.setColor(Color.gray);\r
       g.drawLine(x-av.charWidth,y2,(eRes-sRes+1)*av.charWidth,y2);\r
@@ -1046,12 +1046,16 @@ public class AnnotationPanel extends JPanel implements MouseListener,
           continue;\r
         }\r
 \r
+\r
           g.setColor(aa.annotations[column].colour);\r
           y1 = y - (int) (((aa.annotations[column-1].value-min) / range) * graphHeight);\r
           y2 = y - (int) (((aa.annotations[column].value-min) / range) * graphHeight);\r
           g.drawLine(x-av.charWidth/2, y1, x+av.charWidth/2, y2);\r
           x += av.charWidth;\r
 \r
+          if(aa.annotations[column].value==0)\r
+          System.out.println(y1+" "+y2);\r
+\r
           column++;\r
 \r
        }\r
@@ -1087,7 +1091,7 @@ public class AnnotationPanel extends JPanel implements MouseListener,
       y1 = y2 = y;\r
 \r
       if(min<0)\r
-        y2 = (int)(y - (0-min / (range))*aa.graphHeight);\r
+        y2 = y - (int)((0-min / (range))*aa.graphHeight);\r
 \r
       g.setColor(Color.gray);\r
 \r