JAL-2491 Better merge but not quite right yet

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

diff --git a/src/jalview/viewmodel/OverviewDimensionsShowHidden.java b/src/jalview/viewmodel/OverviewDimensionsShowHidden.java
index 4f7d6c2..3506332 100644 (file)
--- a/src/jalview/viewmodel/OverviewDimensionsShowHidden.java
+++ b/src/jalview/viewmodel/OverviewDimensionsShowHidden.java
@@ -115,7 +115,7 @@ public class OverviewDimensionsShowHidden extends OverviewDimensions
       }
       else
       {
-        visXAsRes = ranges.getEndRes();
+        visXAsRes = ranges.getStartRes();
       }
     }
 
@@ -149,13 +149,13 @@ public class OverviewDimensionsShowHidden extends OverviewDimensions
       }
       else
       {
-        visYAsSeq = ranges.getEndSeq();
+        visYAsSeq = ranges.getStartSeq();
       }
     }
 
     // update viewport
-    ranges.setStartRes(xAsRes);
-    ranges.setStartSeq(yAsSeq);
+    ranges.setStartRes(visXAsRes);
+    ranges.setStartSeq(visYAsSeq);
 
   }
 
@@ -175,15 +175,15 @@ public class OverviewDimensionsShowHidden extends OverviewDimensions
           HiddenColumns hiddenCols)
   {
     // work with absolute values of startRes and endRes
-    int startRes = hiddenCols
-            .adjustForHiddenColumns(ranges.getStartRes());
+    int startRes = hiddenCols.adjustForHiddenColumns(ranges.getStartRes());
     int endRes = hiddenCols.adjustForHiddenColumns(ranges.getEndRes());
 
     // work with absolute values of startSeq and endSeq
     int startSeq = hiddenSeqs.adjustForHiddenSeqs(ranges.getStartSeq());
     int endSeq = hiddenSeqs.adjustForHiddenSeqs(ranges.getEndSeq());
 
-    setBoxPosition(startRes, endRes, startSeq, endSeq);
+    setBoxPosition(startRes, startSeq, endRes - startRes + 1, endSeq
+            - startSeq + 1);
   }
 
   @Override