JAL-2388 Applied ViewportRanges to code

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

diff --git a/src/jalview/appletgui/IdCanvas.java b/src/jalview/appletgui/IdCanvas.java
index 18281d9..abcbd70 100755 (executable)
--- a/src/jalview/appletgui/IdCanvas.java
+++ b/src/jalview/appletgui/IdCanvas.java
@@ -21,6 +21,7 @@
 package jalview.appletgui;
 
 import jalview.datamodel.SequenceI;
+import jalview.viewmodel.ViewportRanges;
 
 import java.awt.Color;
 import java.awt.Font;
@@ -103,17 +104,20 @@ public class IdCanvas extends Panel
       return;
     }
 
+    ViewportRanges ranges = av.getRanges();
+
     gg.copyArea(0, 0, getSize().width, imgHeight, 0,
             -vertical * av.getCharHeight());
 
-    int ss = av.getStartSeq(), es = av.getEndSeq(), transY = 0;
+    int ss = ranges.getStartSeq(), es = ranges.getEndSeq(), transY = 0;
     if (vertical > 0) // scroll down
     {
       ss = es - vertical;
-      if (ss < av.getStartSeq()) // ie scrolling too fast, more than a page at a
+      if (ss < ranges.getStartSeq()) // ie scrolling too fast, more than a page
+                                     // at a
                                  // time
       {
-        ss = av.getStartSeq();
+        ss = ranges.getStartSeq();
       }
       else
       {
@@ -123,9 +127,9 @@ public class IdCanvas extends Panel
     else if (vertical < 0)
     {
       es = ss - vertical;
-      if (es > av.getEndSeq())
+      if (es > ranges.getEndSeq())
       {
-        es = av.getEndSeq();
+        es = ranges.getEndSeq();
       }
     }
 
@@ -181,7 +185,7 @@ public class IdCanvas extends Panel
     gg.setFont(italic);
 
     gg.fillRect(0, 0, getSize().width, getSize().height);
-    drawIds(av.getStartSeq(), av.getEndSeq());
+    drawIds(av.getRanges().getStartSeq(), av.getRanges().getEndSeq());
     g.drawImage(image, 0, 0, this);
   }
 
@@ -234,9 +238,10 @@ public class IdCanvas extends Panel
 
       int cHeight = alheight * avcharHeight + hgap + annotationHeight;
 
-      int rowSize = av.getEndRes() - av.getStartRes();
+      int rowSize = av.getRanges().getEndRes()
+              - av.getRanges().getStartRes();
       // Draw the rest of the panels
-      for (int ypos = hgap, row = av.getStartRes(); (ypos <= getSize().height)
+      for (int ypos = hgap, row = av.getRanges().getStartRes(); (ypos <= getSize().height)
               && (row < maxwidth); ypos += cHeight, row += rowSize)
       {
         for (int i = starty; i < alheight; i++)