Merge remote-tracking branch

[jalview.git] / src / jalview / viewmodel / OverviewDimensionsWithHidden.java

diff --git a/src/jalview/viewmodel/OverviewDimensionsWithHidden.java b/src/jalview/viewmodel/OverviewDimensionsWithHidden.java
index 63172bf..6043755 100644 (file)
--- a/src/jalview/viewmodel/OverviewDimensionsWithHidden.java
+++ b/src/jalview/viewmodel/OverviewDimensionsWithHidden.java
@@ -25,15 +25,11 @@ import jalview.api.AlignmentRowsCollectionI;
 import jalview.datamodel.AlignmentI;
 import jalview.datamodel.AllColsCollection;
 import jalview.datamodel.AllRowsCollection;
-import jalview.datamodel.ColumnSelection;
+import jalview.datamodel.HiddenColumns;
 import jalview.datamodel.HiddenSequences;
 
 public class OverviewDimensionsWithHidden extends OverviewDimensions
 {
-  private float pixelsPerCol;
-
-  private float pixelsPerSeq;
-
   /**
    * Create an OverviewDimensions object
    * 
@@ -47,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();
   }
 
   /**
@@ -70,14 +63,14 @@ public class OverviewDimensionsWithHidden extends OverviewDimensions
    */
   @Override
   public void updateViewportFromMouse(int mousex, int mousey,
-          HiddenSequences hiddenSeqs, ColumnSelection hiddenCols,
+          HiddenSequences hiddenSeqs, HiddenColumns hiddenCols,
           ViewportRanges ranges)
   {
     int x = mousex;
     int y = mousey;
 
-    int alwidth = ranges.getAbsoluteAlignmentWidth();
-    int alheight = ranges.getAbsoluteAlignmentHeight();
+    alwidth = ranges.getAbsoluteAlignmentWidth();
+    alheight = ranges.getAbsoluteAlignmentHeight();
 
     if (x < 0)
     {
@@ -181,10 +174,10 @@ public class OverviewDimensionsWithHidden extends OverviewDimensions
    */
   @Override
   public void setBoxPosition(HiddenSequences hiddenSeqs,
-          ColumnSelection hiddenCols, ViewportRanges ranges)
+          HiddenColumns 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());
@@ -211,7 +204,7 @@ public class OverviewDimensionsWithHidden extends OverviewDimensions
 
   @Override
   public AlignmentColsCollectionI getColumns(ViewportRanges ranges,
-          ColumnSelection hiddenCols)
+          HiddenColumns hiddenCols)
   {
     return new AllColsCollection(0,
             ranges.getAbsoluteAlignmentWidth() - 1,
@@ -226,16 +219,4 @@ public class OverviewDimensionsWithHidden extends OverviewDimensions
             ranges.getAbsoluteAlignmentHeight() - 1,
             al);
   }
-
-  @Override
-  public float getPixelsPerCol()
-  {
-    return pixelsPerCol;
-  }
-
-  @Override
-  public float getPixelsPerSeq()
-  {
-    return pixelsPerSeq;
-  }
 }