revert eventing change that mysteriously broke the zoom sliders

This commit is contained in:
jmillman 2016-05-12 16:37:34 -04:00
parent 8399b03050
commit 259fc185c2
2 changed files with 20 additions and 3 deletions

View File

@ -18,6 +18,7 @@
*/ */
package org.sleuthkit.autopsy.timeline.ui; package org.sleuthkit.autopsy.timeline.ui;
import com.google.common.eventbus.Subscribe;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.Comparator; import java.util.Comparator;
@ -71,6 +72,7 @@ import org.sleuthkit.autopsy.coreutils.ThreadConfined;
import org.sleuthkit.autopsy.timeline.TimeLineController; import org.sleuthkit.autopsy.timeline.TimeLineController;
import org.sleuthkit.autopsy.timeline.datamodel.FilteredEventsModel; import org.sleuthkit.autopsy.timeline.datamodel.FilteredEventsModel;
import org.sleuthkit.autopsy.timeline.datamodel.eventtype.EventType; import org.sleuthkit.autopsy.timeline.datamodel.eventtype.EventType;
import org.sleuthkit.autopsy.timeline.events.RefreshRequestedEvent;
/** /**
* Abstract base class for TimeLineChart based visualizations. * Abstract base class for TimeLineChart based visualizations.
@ -401,6 +403,17 @@ public abstract class AbstractVisualizationPane<X, Y, NodeType extends Node, Cha
controller.monitorTask(updateTask); controller.monitorTask(updateTask);
} }
/**
* Handle a RefreshRequestedEvent from the events model by updating the
* visualization.
*
* @param event The RefreshRequestedEvent to handle.
*/
@Subscribe
public void handleRefreshRequested(RefreshRequestedEvent event) {
refresh();
}
/** /**
* Dispose of this visualization and any resources it holds onto. * Dispose of this visualization and any resources it holds onto.
*/ */

View File

@ -382,8 +382,8 @@ final public class VisualizationPanel extends BorderPane {
} }
/** /**
* Handle a RefreshRequestedEvent from the events model by refreshing the * Handle a RefreshRequestedEvent from the events model by clearing the
* visualization. * refresh notification.
* *
* NOTE: This VisualizationPanel must be registered with the * NOTE: This VisualizationPanel must be registered with the
* filteredEventsModel's EventBus in order for this handler to be invoked. * filteredEventsModel's EventBus in order for this handler to be invoked.
@ -392,7 +392,6 @@ final public class VisualizationPanel extends BorderPane {
*/ */
@Subscribe @Subscribe
public void handleRefreshRequested(RefreshRequestedEvent event) { public void handleRefreshRequested(RefreshRequestedEvent event) {
visualization.refresh();
Platform.runLater(() -> { Platform.runLater(() -> {
if (Bundle.VisualizationPanel_tagsAddedOrDeleted().equals(notificationPane.getText())) { if (Bundle.VisualizationPanel_tagsAddedOrDeleted().equals(notificationPane.getText())) {
notificationPane.hide(); notificationPane.hide();
@ -543,12 +542,17 @@ final public class VisualizationPanel extends BorderPane {
controller.monitorTask(histogramTask); controller.monitorTask(histogramTask);
} }
/**
* Refresh the time selection UI to match the current zoome paramaters.
*/
private void refreshTimeUI() { private void refreshTimeUI() {
RangeDivisionInfo rangeDivisionInfo = RangeDivisionInfo.getRangeDivisionInfo(filteredEvents.getSpanningInterval()); RangeDivisionInfo rangeDivisionInfo = RangeDivisionInfo.getRangeDivisionInfo(filteredEvents.getSpanningInterval());
final long minTime = rangeDivisionInfo.getLowerBound(); final long minTime = rangeDivisionInfo.getLowerBound();
final long maxTime = rangeDivisionInfo.getUpperBound(); final long maxTime = rangeDivisionInfo.getUpperBound();
long startMillis = filteredEvents.getTimeRange().getStartMillis(); long startMillis = filteredEvents.getTimeRange().getStartMillis();
long endMillis = filteredEvents.getTimeRange().getEndMillis(); long endMillis = filteredEvents.getTimeRange().getEndMillis();
if (minTime > 0 && maxTime > minTime) { if (minTime > 0 && maxTime > minTime) {
Platform.runLater(() -> { Platform.runLater(() -> {
startPicker.localDateTimeProperty().removeListener(startListener); startPicker.localDateTimeProperty().removeListener(startListener);