Merge branch 'develop' into features/JAL-845splitPaneMergeDevelop

[jalview.git] / src / jalview / appletgui / IdCanvas.java

diff --git a/src/jalview/appletgui/IdCanvas.java b/src/jalview/appletgui/IdCanvas.java
index bacd14f..7f9eba9 100755 (executable)
--- a/src/jalview/appletgui/IdCanvas.java
+++ b/src/jalview/appletgui/IdCanvas.java
@@ -20,10 +20,14 @@
  */
 package jalview.appletgui;
 
-import java.awt.*;
-import java.util.List;
+import jalview.datamodel.SequenceI;
 
-import jalview.datamodel.*;
+import java.awt.Color;
+import java.awt.Font;
+import java.awt.Graphics;
+import java.awt.Image;
+import java.awt.Panel;
+import java.util.List;
 
 public class IdCanvas extends Panel
 {
@@ -84,7 +88,7 @@ public class IdCanvas extends Panel
             ((i - starty) * charHeight) + ypos + charHeight
                     - (charHeight / 5));
 
-    if (av.hasHiddenRows() && av.showHiddenMarkers)
+    if (av.hasHiddenRows() && av.getShowHiddenMarkers())
     {
       drawMarker(i, starty, ypos);
     }
@@ -99,8 +103,8 @@ public class IdCanvas extends Panel
       return;
     }
 
-    gg.copyArea(0, 0, getSize().width, imgHeight, 0, -vertical
-            * av.charHeight);
+    gg.copyArea(0, 0, getSize().width, imgHeight, 0,
+            -vertical * av.getCharHeight());
 
     int ss = av.startSeq, es = av.endSeq, transY = 0;
     if (vertical > 0) // scroll down
@@ -112,7 +116,7 @@ public class IdCanvas extends Panel
       }
       else
       {
-        transY = imgHeight - vertical * av.charHeight;
+        transY = imgHeight - vertical * av.getCharHeight();
       }
     }
     else if (vertical < 0)
@@ -153,7 +157,7 @@ public class IdCanvas extends Panel
     }
 
     imgHeight = getSize().height;
-    imgHeight -= imgHeight % av.charHeight;
+    imgHeight -= imgHeight % av.getCharHeight();
 
     if (imgHeight < 1)
     {
@@ -178,10 +182,17 @@ public class IdCanvas extends Panel
     g.drawImage(image, 0, 0, this);
   }
 
+  /**
+   * local copy of av.getCharHeight set at top of drawIds
+   */
+  private int avcharHeight;
   void drawIds(int starty, int endy)
   {
+    // hardwired italic IDs in applet currently
     Font italic = new Font(av.getFont().getName(), Font.ITALIC, av
             .getFont().getSize());
+    // temp variable for speed
+    avcharHeight = av.getCharHeight();
 
     gg.setFont(italic);
 
@@ -201,20 +212,19 @@ public class IdCanvas extends Panel
       int annotationHeight = 0;
       AnnotationLabels labels = null;
 
-      if (av.showAnnotation)
+      if (av.isShowAnnotation())
       {
         AnnotationPanel ap = new AnnotationPanel(av);
         annotationHeight = ap.adjustPanelHeight();
         labels = new AnnotationLabels(av);
       }
-
-      int hgap = av.charHeight;
-      if (av.scaleAboveWrapped)
+      int hgap = avcharHeight;
+      if (av.getScaleAboveWrapped())
       {
-        hgap += av.charHeight;
+        hgap += avcharHeight;
       }
 
-      int cHeight = alheight * av.charHeight + hgap + annotationHeight;
+      int cHeight = alheight * avcharHeight + hgap + annotationHeight;
 
       int rowSize = av.getEndRes() - av.getStartRes();
 
@@ -236,9 +246,9 @@ public class IdCanvas extends Panel
 
         if (labels != null)
         {
-          gg.translate(0, ypos + (alheight * av.charHeight));
+          gg.translate(0, ypos + (alheight * avcharHeight));
           labels.drawComponent(gg, getSize().width);
-          gg.translate(0, -ypos - (alheight * av.charHeight));
+          gg.translate(0, -ypos - (alheight * avcharHeight));
         }
 
       }
@@ -284,15 +294,15 @@ public class IdCanvas extends Panel
         gg.setColor(currentColor);
         // TODO: isrep could be used to highlight the representative in a
         // different way
-        gg.fillRect(0, (i - starty) * av.charHeight, getSize().width,
-                av.charHeight);
+        gg.fillRect(0, (i - starty) * avcharHeight, getSize().width,
+                avcharHeight);
         gg.setColor(currentTextColor);
 
         gg.drawString(seq.getDisplayId(av.getShowJVSuffix()), 0,
-                (((i - starty) * av.charHeight) + av.charHeight)
-                        - (av.charHeight / 5));
+                (((i - starty) * avcharHeight) + avcharHeight)
+                        - (avcharHeight / 5));
 
-        if (av.hasHiddenRows() && av.showHiddenMarkers)
+        if (av.hasHiddenRows() && av.getShowHiddenMarkers())
         {
           drawMarker(i, starty, 0);
         }
@@ -343,20 +353,20 @@ public class IdCanvas extends Panel
     if (below)
     {
       gg.fillPolygon(new int[]
-      { getSize().width - av.charHeight, getSize().width - av.charHeight,
+      { getSize().width - avcharHeight, getSize().width - avcharHeight,
           getSize().width }, new int[]
-      { (i - starty) * av.charHeight + yoffset,
-          (i - starty) * av.charHeight + yoffset + av.charHeight / 4,
-          (i - starty) * av.charHeight + yoffset }, 3);
+      { (i - starty) * avcharHeight + yoffset,
+          (i - starty) * avcharHeight + yoffset + avcharHeight / 4,
+          (i - starty) * avcharHeight + yoffset }, 3);
     }
     if (above)
     {
       gg.fillPolygon(new int[]
-      { getSize().width - av.charHeight, getSize().width - av.charHeight,
+      { getSize().width - avcharHeight, getSize().width - avcharHeight,
           getSize().width }, new int[]
-      { (i - starty + 1) * av.charHeight + yoffset,
-          (i - starty + 1) * av.charHeight + yoffset - av.charHeight / 4,
-          (i - starty + 1) * av.charHeight + yoffset }, 3);
+      { (i - starty + 1) * avcharHeight + yoffset,
+          (i - starty + 1) * avcharHeight + yoffset - avcharHeight / 4,
+          (i - starty + 1) * avcharHeight + yoffset }, 3);
 
     }
   }