X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fviewmodel%2FOverviewDimensionsWithHidden.java;h=eff27dd17d5b620ada3df7fe7b8086361689adea;hb=cdd071033b669ae1489f3bba67c4a0a041776b31;hp=575167ae507529bc3e4a9d55baacebbf54685edd;hpb=2feac6dabe64b144783f8538fab352e987eadcb6;p=jalview.git

diff --git a/src/jalview/viewmodel/OverviewDimensionsWithHidden.java b/src/jalview/viewmodel/OverviewDimensionsWithHidden.java
index 575167a..eff27dd 100644
--- a/src/jalview/viewmodel/OverviewDimensionsWithHidden.java
+++ b/src/jalview/viewmodel/OverviewDimensionsWithHidden.java
@@ -20,18 +20,16 @@
  */
 package jalview.viewmodel;
 
-import jalview.datamodel.AlignmentColsCollection;
+import jalview.api.AlignmentColsCollectionI;
+import jalview.api.AlignmentRowsCollectionI;
 import jalview.datamodel.AlignmentI;
-import jalview.datamodel.AlignmentRowsCollection;
+import jalview.datamodel.AllColsCollection;
+import jalview.datamodel.AllRowsCollection;
 import jalview.datamodel.ColumnSelection;
 import jalview.datamodel.HiddenSequences;
 
 public class OverviewDimensionsWithHidden extends OverviewDimensions
 {
-  private float pixelsPerCol;
-
-  private float pixelsPerSeq;
-
   /**
    * Create an OverviewDimensions object
    * 
@@ -45,11 +43,8 @@ public class OverviewDimensionsWithHidden extends OverviewDimensions
   {
     super(ranges, showAnnotationPanel);
 
-    int alwidth = ranges.getAbsoluteAlignmentWidth();
-    int alheight = ranges.getAbsoluteAlignmentHeight();
-
-    pixelsPerCol = (float) width / alwidth;
-    pixelsPerSeq = (float) sequencesHeight / alheight;
+    alwidth = ranges.getAbsoluteAlignmentWidth();
+    alheight = ranges.getAbsoluteAlignmentHeight();
   }
 
   /**
@@ -74,8 +69,8 @@ public class OverviewDimensionsWithHidden extends OverviewDimensions
     int x = mousex;
     int y = mousey;
 
-    int alwidth = ranges.getAbsoluteAlignmentWidth();
-    int alheight = ranges.getAbsoluteAlignmentHeight();
+    alwidth = ranges.getAbsoluteAlignmentWidth();
+    alheight = ranges.getAbsoluteAlignmentHeight();
 
     if (x < 0)
     {
@@ -181,8 +176,8 @@ public class OverviewDimensionsWithHidden extends OverviewDimensions
   public void setBoxPosition(HiddenSequences hiddenSeqs,
           ColumnSelection hiddenCols, ViewportRanges ranges)
   {
-    int alwidth = ranges.getAbsoluteAlignmentWidth();
-    int alheight = ranges.getAbsoluteAlignmentHeight();
+    alwidth = ranges.getAbsoluteAlignmentWidth();
+    alheight = ranges.getAbsoluteAlignmentHeight();
 
     // work with absolute values of startRes and endRes
     int startRes = hiddenCols.adjustForHiddenColumns(ranges.getStartRes());
@@ -208,32 +203,20 @@ public class OverviewDimensionsWithHidden extends OverviewDimensions
   }
 
   @Override
-  public AlignmentColsCollection getColumns(ViewportRanges ranges,
+  public AlignmentColsCollectionI getColumns(ViewportRanges ranges,
           ColumnSelection hiddenCols)
   {
-    return new AlignmentColsCollection(0,
+    return new AllColsCollection(0,
             ranges.getAbsoluteAlignmentWidth() - 1,
             hiddenCols);
   }
 
   @Override
-  public AlignmentRowsCollection getRows(ViewportRanges ranges,
+  public AlignmentRowsCollectionI getRows(ViewportRanges ranges,
           AlignmentI al)
   {
-    return new AlignmentRowsCollection(0,
+    return new AllRowsCollection(0,
             ranges.getAbsoluteAlignmentHeight() - 1,
             al);
   }
-
-  @Override
-  public float getPixelsPerCol()
-  {
-    return pixelsPerCol;
-  }
-
-  @Override
-  public float getPixelsPerSeq()
-  {
-    return pixelsPerSeq;
-  }
 }