X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FIdCanvas.java;h=58a4f107519548f27d3e5398983a05484f67f677;hb=17e77c3f2949a0729322b4a8d907f3f34b6a9914;hp=bacd14f6d0b95706c82398589d98f82810717dde;hpb=ad15cff29620f960119f80176f1fd443da9f6763;p=jalview.git

diff --git a/src/jalview/appletgui/IdCanvas.java b/src/jalview/appletgui/IdCanvas.java
index bacd14f..58a4f10 100755
--- a/src/jalview/appletgui/IdCanvas.java
+++ b/src/jalview/appletgui/IdCanvas.java
@@ -1,6 +1,6 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
- * Copyright (C) $$Year-Rel$$ The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9)
+ * Copyright (C) 2015 The Jalview Authors
  * 
  * This file is part of Jalview.
  * 
@@ -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
 {
@@ -52,8 +56,8 @@ public class IdCanvas extends Panel
     PaintRefresher.Register(this, av.getSequenceSetId());
   }
 
-  public void drawIdString(Graphics gg, SequenceI s, int i, int starty,
-          int ypos)
+  public void drawIdString(Graphics gg, boolean hiddenRows, SequenceI s,
+          int i, int starty, int ypos)
   {
     int charHeight = av.getCharHeight();
 
@@ -84,7 +88,7 @@ public class IdCanvas extends Panel
             ((i - starty) * charHeight) + ypos + charHeight
                     - (charHeight / 5));
 
-    if (av.hasHiddenRows() && av.showHiddenMarkers)
+    if (hiddenRows)
     {
       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,16 +182,28 @@ 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);
 
     Color currentColor = Color.white;
     Color currentTextColor = Color.black;
 
+    final boolean doHiddenCheck = av.isDisplayReferenceSeq()
+            || av.hasHiddenRows(), hiddenRows = av.hasHiddenRows()
+            && av.getShowHiddenMarkers();
+
     if (av.getWrapAlignment())
     {
       int maxwidth = av.getAlignment().getWidth();
@@ -201,23 +217,21 @@ 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();
-
       // Draw the rest of the panels
       for (int ypos = hgap, row = av.startRes; (ypos <= getSize().height)
               && (row < maxwidth); ypos += cHeight, row += rowSize)
@@ -227,18 +241,18 @@ public class IdCanvas extends Panel
 
           SequenceI s = av.getAlignment().getSequenceAt(i);
           gg.setFont(italic);
-          if (av.isDisplayReferenceSeq() || av.hasHiddenRows())
+          if (doHiddenCheck)
           {
             setHiddenFont(s);
           }
-          drawIdString(gg, s, i, 0, ypos);
+          drawIdString(gg, hiddenRows, s, i, 0, ypos);
         }
 
         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));
         }
 
       }
@@ -257,7 +271,7 @@ public class IdCanvas extends Panel
         }
         gg.setFont(italic);
         // boolean isrep=false;
-        if (av.isDisplayReferenceSeq() || av.hasHiddenRows())
+        if (doHiddenCheck)
         {
           // isrep =
           setHiddenFont(seq);
@@ -284,15 +298,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 (hiddenRows)
         {
           drawMarker(i, starty, 0);
         }
@@ -342,21 +356,19 @@ public class IdCanvas extends Panel
     gg.setColor(Color.blue);
     if (below)
     {
-      gg.fillPolygon(new int[]
-      { getSize().width - av.charHeight, getSize().width - av.charHeight,
-          getSize().width }, new int[]
-      { (i - starty) * av.charHeight + yoffset,
-          (i - starty) * av.charHeight + yoffset + av.charHeight / 4,
-          (i - starty) * av.charHeight + yoffset }, 3);
+      gg.fillPolygon(new int[] { getSize().width - avcharHeight,
+          getSize().width - avcharHeight, getSize().width }, new int[] {
+          (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 }, new int[]
-      { (i - starty + 1) * av.charHeight + yoffset,
-          (i - starty + 1) * av.charHeight + yoffset - av.charHeight / 4,
-          (i - starty + 1) * av.charHeight + yoffset }, 3);
+      gg.fillPolygon(new int[] { getSize().width - avcharHeight,
+          getSize().width - avcharHeight, getSize().width }, new int[] {
+          (i - starty + 1) * avcharHeight + yoffset,
+          (i - starty + 1) * avcharHeight + yoffset - avcharHeight / 4,
+          (i - starty + 1) * avcharHeight + yoffset }, 3);
 
     }
   }