X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fviewmodel%2FOverviewDimensionsTest.java;h=398fec302d0578a99b5edded73f9553a8698ee62;hb=9201765247470c08d366abef2713c1c736adf2cb;hp=a1d9f3157418e79e3b0fca1d4a5e20fa4077dcd0;hpb=80fbfc0050c934ccdab11ccbd5f87d517ff4c04a;p=jalview.git

diff --git a/test/jalview/viewmodel/OverviewDimensionsTest.java b/test/jalview/viewmodel/OverviewDimensionsTest.java
index a1d9f31..398fec3 100644
--- a/test/jalview/viewmodel/OverviewDimensionsTest.java
+++ b/test/jalview/viewmodel/OverviewDimensionsTest.java
@@ -52,7 +52,7 @@ public class OverviewDimensionsTest
   int alheight;
   int alwidth;
 
-  ViewportPositionProps posProps;
+  ViewportRanges vpranges;
 
   Hashtable<SequenceI, SequenceCollectionI> hiddenRepSequences = new Hashtable<SequenceI, SequenceCollectionI>();
 
@@ -75,33 +75,33 @@ public class OverviewDimensionsTest
     }
     hiddenCols.revealAllHiddenColumns();
     
-    posProps = new ViewportPositionProps(al);
-    posProps.setStartRes(0);
-    posProps.setEndRes(62);
-    posProps.setStartSeq(0);
-    posProps.setEndSeq(17);
+    vpranges = new ViewportRanges(al);
+    vpranges.setStartRes(0);
+    vpranges.setEndRes(62);
+    vpranges.setStartSeq(0);
+    vpranges.setEndSeq(17);
 
-    viewHeight = posProps.getEndSeq() - posProps.getStartSeq() + 1;
-    viewWidth = posProps.getEndRes() - posProps.getStartRes() + 1;
+    viewHeight = vpranges.getEndSeq() - vpranges.getStartSeq() + 1;
+    viewWidth = vpranges.getEndRes() - vpranges.getStartRes() + 1;
 
     ColumnSelection hiddenCols = new ColumnSelection();
 
-    od = new OverviewDimensions(posProps, true);
+    od = new OverviewDimensions(vpranges, true);
     // Initial box sizing - default path through code
-    od.setBoxPosition(al.getHiddenSequences(), hiddenCols, posProps);
+    od.setBoxPosition(al.getHiddenSequences(), hiddenCols, vpranges);
 
     mouseClick(od, 0, 0);
     moveViewport(0, 0);
 
     // calculate before hidden columns so we get absolute values
-    alheight = posProps.getAbsoluteAlignmentHeight();
-    alwidth = posProps.getAbsoluteAlignmentWidth();
+    alheight = vpranges.getAbsoluteAlignmentHeight();
+    alwidth = vpranges.getAbsoluteAlignmentWidth();
 
-    boxWidth = Math.round((float) (posProps.getEndRes()
-            - posProps.getStartRes() + 1)
+    boxWidth = Math.round((float) (vpranges.getEndRes()
+            - vpranges.getStartRes() + 1)
             * od.getWidth() / alwidth);
-    boxHeight = Math.round((float) (posProps.getEndSeq()
-            - posProps.getStartSeq() + 1)
+    boxHeight = Math.round((float) (vpranges.getEndSeq()
+            - vpranges.getStartSeq() + 1)
             * od.getSequencesHeight() / alheight);
   }
 
@@ -134,7 +134,7 @@ public class OverviewDimensionsTest
     // test for alignment with width > height
     SequenceI[] seqs1 = new SequenceI[] { seqa, seqb };
     Alignment al1 = new Alignment(seqs1);
-    ViewportPositionProps props = new ViewportPositionProps(al1);
+    ViewportRanges props = new ViewportRanges(al1);
 
     OverviewDimensions od = new OverviewDimensions(props, true);
     int scaledHeight = 267;
@@ -146,7 +146,7 @@ public class OverviewDimensionsTest
     // test for alignment with width < height
     SequenceI[] seqs2 = new SequenceI[] { seqa, seqb, seqc, seqd };
     Alignment al2 = new Alignment(seqs2);
-    props = new ViewportPositionProps(al2);
+    props = new ViewportRanges(al2);
 
     od = new OverviewDimensions(props, true);
     int scaledWidth = 300;
@@ -159,7 +159,7 @@ public class OverviewDimensionsTest
     // min value
     SequenceI[] seqs3 = new SequenceI[] { seqe };
     Alignment al3 = new Alignment(seqs3);
-    props = new ViewportPositionProps(al3);
+    props = new ViewportRanges(al3);
 
     od = new OverviewDimensions(props, true);
     assertEquals(od.getGraphHeight(), defaultGraphHeight);
@@ -171,7 +171,7 @@ public class OverviewDimensionsTest
     SequenceI[] seqs4 = new SequenceI[] { seqa, seqb, seqc, seqd, seqa,
         seqb, seqc, seqd, seqa, seqb, seqc, seqd, seqa, seqb, seqc, seqd };
     Alignment al4 = new Alignment(seqs4);
-    props = new ViewportPositionProps(al4);
+    props = new ViewportRanges(al4);
 
     od = new OverviewDimensions(props, true);
     assertEquals(od.getGraphHeight(), defaultGraphHeight);
@@ -180,7 +180,7 @@ public class OverviewDimensionsTest
     assertEquals(od.getHeight(), maxSeqHeight + defaultGraphHeight);
 
     Alignment al5 = new Alignment(seqs4);
-    props = new ViewportPositionProps(al5);
+    props = new ViewportRanges(al5);
 
     od = new OverviewDimensions(props, false);
     assertEquals(od.getGraphHeight(), 0);
@@ -198,7 +198,7 @@ public class OverviewDimensionsTest
   public void testSetBoxFromMouseClick()
   {
     od.updateViewportFromMouse(0, 0, al.getHiddenSequences(), hiddenCols,
-            posProps);
+            vpranges);
     assertEquals(od.getBoxX(), 0);
     assertEquals(od.getBoxY(), 0);
     assertEquals(od.getBoxWidth(), boxWidth);
@@ -297,7 +297,7 @@ public class OverviewDimensionsTest
   public void testFromMouseWithHiddenColsAtStart()
   {
     od.updateViewportFromMouse(0, 0, al.getHiddenSequences(), hiddenCols,
-            posProps);
+            vpranges);
     assertEquals(od.getBoxX(), 0);
     assertEquals(od.getBoxY(), 0);
     assertEquals(od.getBoxWidth(), boxWidth);
@@ -309,7 +309,7 @@ public class OverviewDimensionsTest
     int lastHiddenCol = 30;
     hiddenCols.hideColumns(0, lastHiddenCol);
 
-    od.setBoxPosition(al.getHiddenSequences(), hiddenCols, posProps);
+    od.setBoxPosition(al.getHiddenSequences(), hiddenCols, vpranges);
     assertEquals(od.getBoxX(),
             Math.round((float) (lastHiddenCol + 1) * od.getWidth()
                     / alwidth));
@@ -362,7 +362,7 @@ public class OverviewDimensionsTest
   public void testFromMouseWithHiddenColsInMiddle()
   {
     od.updateViewportFromMouse(0, 0, al.getHiddenSequences(), hiddenCols,
-            posProps);
+            vpranges);
     assertEquals(od.getBoxX(), 0);
     assertEquals(od.getBoxY(), 0);
     assertEquals(od.getBoxWidth(), boxWidth);
@@ -374,7 +374,7 @@ public class OverviewDimensionsTest
     int lastHidden = 73;
     hiddenCols.hideColumns(firstHidden, lastHidden);
 
-    od.setBoxPosition(al.getHiddenSequences(), hiddenCols, posProps);
+    od.setBoxPosition(al.getHiddenSequences(), hiddenCols, vpranges);
     assertEquals(od.getBoxX(), 0);
     assertEquals(od.getBoxY(), 0);
     assertEquals(od.getBoxWidth(), boxWidth);
@@ -464,7 +464,7 @@ public class OverviewDimensionsTest
   public void testFromMouseWithHiddenColsAtEnd()
   {
     od.updateViewportFromMouse(0, 0, al.getHiddenSequences(), hiddenCols,
-            posProps);
+            vpranges);
     assertEquals(od.getBoxX(), 0);
     assertEquals(od.getBoxY(), 0);
     assertEquals(od.getBoxWidth(), boxWidth);
@@ -475,7 +475,7 @@ public class OverviewDimensionsTest
     int firstHidden = 140;
     int lastHidden = 164;
     hiddenCols.hideColumns(firstHidden, lastHidden);
-    od.setBoxPosition(al.getHiddenSequences(), hiddenCols, posProps);
+    od.setBoxPosition(al.getHiddenSequences(), hiddenCols, vpranges);
     assertEquals(od.getBoxX(), 0);
     assertEquals(od.getBoxY(), 0);
     assertEquals(od.getBoxWidth(), boxWidth);
@@ -791,7 +791,7 @@ public class OverviewDimensionsTest
   public void testFromMouseWithHiddenRowsAtStart()
   {
     od.updateViewportFromMouse(0, 0, al.getHiddenSequences(), hiddenCols,
-            posProps);
+            vpranges);
     assertEquals(od.getBoxX(), 0);
     assertEquals(od.getBoxY(), 0);
     assertEquals(od.getBoxHeight(), boxHeight);
@@ -804,7 +804,7 @@ public class OverviewDimensionsTest
     int lastHiddenRow = 30;
     hideSequences(0, lastHiddenRow);
 
-    od.setBoxPosition(al.getHiddenSequences(), hiddenCols, posProps);
+    od.setBoxPosition(al.getHiddenSequences(), hiddenCols, vpranges);
     assertEquals(od.getBoxX(), 0);
     assertEquals(od.getBoxY(),
             Math.round((float) (lastHiddenRow + 1)
@@ -838,7 +838,7 @@ public class OverviewDimensionsTest
   public void testFromMouseWithHiddenRowsInMiddle()
   {
     od.updateViewportFromMouse(0, 0, al.getHiddenSequences(), hiddenCols,
-            posProps);
+            vpranges);
 
     assertEquals(od.getBoxX(), 0);
     assertEquals(od.getBoxY(), 0);
@@ -853,7 +853,7 @@ public class OverviewDimensionsTest
     int lastHiddenRow = 54;
     hideSequences(firstHiddenRow, lastHiddenRow);
 
-    od.setBoxPosition(al.getHiddenSequences(), hiddenCols, posProps);
+    od.setBoxPosition(al.getHiddenSequences(), hiddenCols, vpranges);
 
     assertEquals(od.getBoxX(), 0);
     assertEquals(od.getBoxY(), 0);
@@ -897,7 +897,7 @@ public class OverviewDimensionsTest
   public void testFromMouseWithHiddenRowsAtEnd()
   {
     od.updateViewportFromMouse(0, 0, al.getHiddenSequences(), hiddenCols,
-            posProps);
+            vpranges);
     assertEquals(od.getBoxX(), 0);
     assertEquals(od.getBoxY(), 0);
     assertEquals(od.getBoxWidth(), boxWidth);
@@ -911,7 +911,7 @@ public class OverviewDimensionsTest
     int lastHidden = 524;
     hideSequences(firstHidden, lastHidden);
 
-    od.setBoxPosition(al.getHiddenSequences(), hiddenCols, posProps);
+    od.setBoxPosition(al.getHiddenSequences(), hiddenCols, vpranges);
     assertEquals(od.getBoxX(), 0);
     assertEquals(od.getBoxY(), 0);
     assertEquals(od.getBoxWidth(), boxWidth);
@@ -958,9 +958,9 @@ public class OverviewDimensionsTest
    */
   private void moveViewportH(int startRes)
   {
-    posProps.setStartRes(startRes);
-    posProps.setEndRes(startRes + viewWidth - 1);
-    od.setBoxPosition(al.getHiddenSequences(), hiddenCols, posProps);
+    vpranges.setStartRes(startRes);
+    vpranges.setEndRes(startRes + viewWidth - 1);
+    od.setBoxPosition(al.getHiddenSequences(), hiddenCols, vpranges);
   }
 
   /*
@@ -968,9 +968,9 @@ public class OverviewDimensionsTest
    */
   private void moveViewportV(int startSeq)
   {
-    posProps.setStartSeq(startSeq);
-    posProps.setEndSeq(startSeq + viewHeight - 1);
-    od.setBoxPosition(al.getHiddenSequences(), hiddenCols, posProps);
+    vpranges.setStartSeq(startSeq);
+    vpranges.setEndSeq(startSeq + viewHeight - 1);
+    od.setBoxPosition(al.getHiddenSequences(), hiddenCols, vpranges);
   }
 
   /*
@@ -978,11 +978,11 @@ public class OverviewDimensionsTest
    */
   private void moveViewport(int startRes, int startSeq)
   {
-    posProps.setStartRes(startRes);
-    posProps.setEndRes(startRes + viewWidth - 1);
-    posProps.setStartSeq(startSeq);
-    posProps.setEndSeq(startSeq + viewHeight - 1);
-    od.setBoxPosition(al.getHiddenSequences(), hiddenCols, posProps);
+    vpranges.setStartRes(startRes);
+    vpranges.setEndRes(startRes + viewWidth - 1);
+    vpranges.setStartSeq(startSeq);
+    vpranges.setEndSeq(startSeq + viewHeight - 1);
+    od.setBoxPosition(al.getHiddenSequences(), hiddenCols, vpranges);
   }
 
   /*
@@ -991,17 +991,17 @@ public class OverviewDimensionsTest
   private void mouseClick(OverviewDimensions od, int x, int y)
   {
     od.updateViewportFromMouse(x, y, al.getHiddenSequences(), hiddenCols,
-            posProps);
+            vpranges);
 
     // updates require an OverviewPanel to exist which it doesn't here
     // so call setBoxPosition() as it would be called by the AlignmentPanel
     // normally
 
-    posProps.setStartRes(od.getScrollCol());
-    posProps.setEndRes(od.getScrollCol() + viewWidth - 1);
-    posProps.setStartSeq(od.getScrollRow());
-    posProps.setEndSeq(od.getScrollRow() + viewHeight - 1);
-    od.setBoxPosition(al.getHiddenSequences(), hiddenCols, posProps);
+    vpranges.setStartRes(od.getScrollCol());
+    vpranges.setEndRes(od.getScrollCol() + viewWidth - 1);
+    vpranges.setStartSeq(od.getScrollRow());
+    vpranges.setEndSeq(od.getScrollRow() + viewHeight - 1);
+    od.setBoxPosition(al.getHiddenSequences(), hiddenCols, vpranges);
   }
   
   /*