🐛 fixed timeline bug where box shrank when panning (#499)

Author: antares1470

CHANGELOG.md

@@ -1,6 +1,8 @@
 # Constellation Changes
 
 ## 2020-05-01 Changes in May 2020
+* Fixed a bug effecting the histogram scrolling
+* Changed parameter types for `OverviewPanel.setExtentPOV()` from longs to doubles.
 * Fixed a bug effecting the histogram scrolling.
 * Fixed a bug preventing v1 graphs from being open.
 

CoreTimelineView/src/au/gov/asd/tac/constellation/views/timeline/OverviewPanel.java

@@ -30,7 +30,6 @@
 import javafx.scene.chart.NumberAxis;
 import javafx.scene.chart.XYChart;
 import javafx.scene.input.MouseEvent;
-import javafx.scene.input.ScrollEvent;
 import javafx.scene.layout.AnchorPane;
 import javafx.scene.layout.Pane;
 import javafx.scene.paint.Color;
@@ -103,13 +102,7 @@ public OverviewPanel(final TimelineTopComponent coordinator) {
 
         this.getStylesheets().add(OverviewPanel.class.getResource(DARK_THEME).toExternalForm());
         this.getChildren().add(innerPane);
-        this.setOnScroll(new EventHandler<ScrollEvent>() {
-
-            @Override
-            public void handle(final ScrollEvent t) {
-                coordinator.zoomFromOverview(t);
-            }
-        });
+        this.setOnScroll(coordinator::zoomFromOverview);
 
     }
 
@@ -135,12 +128,22 @@ public void setParent(final TimelineTopComponent parent) {
      * @param upperBound The upper time extent that needs to be represented on
      * the POV component.
      */
-    public void setExtentPOV(long lowerBound, long upperBound) {
-        if (lowerBound <= lowestTimeExtent) {
-            lowerBound = (long) lowestTimeExtent;
+    public void setExtentPOV(double lowerBound, double upperBound) {
+        if (lowerBound < lowestTimeExtent) {
+            lowerBound = lowestTimeExtent;
+            
+            final double currentUpperBound = ((pov.getX() + pov.getWidth()) / this.getWidth() * range) + lowestTimeExtent;
+            if (upperBound < currentUpperBound) {
+                upperBound = currentUpperBound;
+            }
         }
-        if (upperBound >= highestTimeExtent) {
-            upperBound = (long) highestTimeExtent;
+        if (upperBound > highestTimeExtent) {
+            upperBound = highestTimeExtent;
+            
+            final double currentLowerBound = (pov.getX() / this.getWidth() * range) + lowestTimeExtent;
+            if (lowerBound > currentLowerBound) {
+                lowerBound = currentLowerBound;
+            }
         }
 
         final double normalLowerBound = lowerBound - lowestTimeExtent;
@@ -265,8 +268,8 @@ public void populateHistogram(final ReadableGraph graph, final String datetimeAt
             xAxis.setLowerBound(0);
             xAxis.setUpperBound(intervals);
 
-            setExtentPOV((long) coordinator.getTimelineLowerTimeExtent(),
-                    (long) coordinator.getTimelineUpperTimeExtent());
+            setExtentPOV(coordinator.getTimelineLowerTimeExtent(),
+                    coordinator.getTimelineUpperTimeExtent());
         }
     }
     // </editor-fold>

CoreTimelineView/src/au/gov/asd/tac/constellation/views/timeline/TimelineTopComponent.java

@@ -211,7 +211,7 @@ public void setExtents(final double lowerTimeExtent, final double upperTimeExten
 
             timelinePanel.updateExclusionState(graphNode.getGraph(),
                     (long) state.getLowerTimeExtent(), (long) state.getUpperTimeExtent(), state.exclusionState());
-            overviewPanel.setExtentPOV((long) state.getLowerTimeExtent(), (long) state.getUpperTimeExtent());
+            overviewPanel.setExtentPOV(state.getLowerTimeExtent(), state.getUpperTimeExtent());
         }
     }
 
@@ -264,7 +264,7 @@ public void setExtents() {
 
             timelinePanel.updateExclusionState(graphNode.getGraph(),
                     (long) state.getLowerTimeExtent(), (long) state.getUpperTimeExtent(), state.exclusionState());
-            overviewPanel.setExtentPOV((long) state.getLowerTimeExtent(), (long) state.getUpperTimeExtent());
+            overviewPanel.setExtentPOV(state.getLowerTimeExtent(), state.getUpperTimeExtent());
         }
     }