mstoeck3/autopsy-flatpak
1
0
Fork 0
mirror of https://github.com/overcuriousity/autopsy-flatpak.git synced 2025-07-17 18:17:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

use correct formula to interpret rangeslider values

Browse Source 
other minor cleanup
This commit is contained in:
jmillman 2015-11-02 16:20:08 -05:00
parent 9853f4ad1c
commit a688788405
1 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
Core/src/org/sleuthkit/autopsy/timeline/ui/VisualizationPanel.java
View File

@ -67,7 +67,6 @@ import org.controlsfx.control.RangeSlider;
import org.controlsfx.control.action.Action; import org.controlsfx.control.action.Action;
import org.controlsfx.control.action.ActionUtils; import org.controlsfx.control.action.ActionUtils;
import org.joda.time.DateTime; import org.joda.time.DateTime;
import org.joda.time.DateTimeZone;
import org.joda.time.Interval; import org.joda.time.Interval;
import org.openide.util.NbBundle; import org.openide.util.NbBundle;
import org.sleuthkit.autopsy.coreutils.LoggedTask; import org.sleuthkit.autopsy.coreutils.LoggedTask;
@ -178,21 +177,13 @@ final public class VisualizationPanel extends BorderPane {
public void invalidated(Observable observable) { public void invalidated(Observable observable) {
if (rangeSlider.isHighValueChanging() == false if (rangeSlider.isHighValueChanging() == false
&& rangeSlider.isLowValueChanging() == false) { && rangeSlider.isLowValueChanging() == false) {
Long minTime = filteredEvents.getMinTime() * 1000; Long minTime = RangeDivisionInfo.getRangeDivisionInfo(filteredEvents.getSpanningInterval()).getLowerBound();
controller.pushTimeRange(new Interval( if (false == controller.pushTimeRange(new Interval(
new Double(rangeSlider.getLowValue() + minTime).longValue(), (long) (rangeSlider.getLowValue() + minTime),
new Double(rangeSlider.getHighValue() + minTime).longValue(), (long) (rangeSlider.getHighValue() + minTime + 1000)))) {
DateTimeZone.UTC)); refreshTimeUI();
} }
} }
};
/**
* listens to timerange of filtered events model and updates UI to match
*/
final private InvalidationListener timeRangeInvalidationListener = new InvalidationListener() {
public void invalidated(Observable observable) {
refreshTimeUI(filteredEvents.timeRangeProperty().get());
} }
}; };
@ -349,10 +340,10 @@ final public class VisualizationPanel extends BorderPane {
filteredEvents.registerForEvents(this); filteredEvents.registerForEvents(this);
//listen for changes in the time range / zoom params //listen for changes in the time range / zoom params
TimeLineController.getTimeZone().addListener(timeRangeInvalidationListener); TimeLineController.getTimeZone().addListener(timeZoneProp -> refreshTimeUI());
filteredEvents.timeRangeProperty().addListener(timeRangeInvalidationListener); filteredEvents.timeRangeProperty().addListener(timeRangeProp -> refreshTimeUI());
filteredEvents.zoomParametersProperty().addListener(zoomListener); filteredEvents.zoomParametersProperty().addListener(zoomListener);
refreshTimeUI(filteredEvents.timeRangeProperty().get()); //populate the viz refreshTimeUI(); //populate the viz
//this should use an event(EventBus) , not this weird observable pattern //this should use an event(EventBus) , not this weird observable pattern
controller.getNeedsHistogramRebuild().addListener((observable, oldValue, newValue) -> { controller.getNeedsHistogramRebuild().addListener((observable, oldValue, newValue) -> {
@ -425,6 +416,7 @@ final public class VisualizationPanel extends BorderPane {
} }
synchronized private void refreshHistorgram() { synchronized private void refreshHistorgram() {
if (histogramTask != null) { if (histogramTask != null) {
histogramTask.cancel(true); histogramTask.cancel(true);
} }
@ -508,12 +500,20 @@ final public class VisualizationPanel extends BorderPane {
controller.monitorTask(histogramTask); controller.monitorTask(histogramTask);
} }
private void refreshTimeUI() {
refreshTimeUI(filteredEvents.timeRangeProperty().get());
}
private void refreshTimeUI(Interval interval) { private void refreshTimeUI(Interval interval) {
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 = interval.getStartMillis();
long endMillis = interval.getEndMillis();
if (minTime > 0 && maxTime > minTime) { if (minTime > 0 && maxTime > minTime) {
Platform.runLater(() -> { Platform.runLater(() -> {
@ -523,8 +523,7 @@ final public class VisualizationPanel extends BorderPane {
rangeSlider.lowValueChangingProperty().removeListener(rangeSliderListener); rangeSlider.lowValueChangingProperty().removeListener(rangeSliderListener);
rangeSlider.setMax((maxTime - minTime)); rangeSlider.setMax((maxTime - minTime));
long startMillis = interval.getStartMillis();
long endMillis = interval.getEndMillis();
rangeSlider.setLowValue(startMillis - minTime); rangeSlider.setLowValue(startMillis - minTime);
rangeSlider.setHighValue(endMillis - minTime); rangeSlider.setHighValue(endMillis - minTime);
startPicker.setLocalDateTime(epochMillisToLocalDateTime(startMillis)); startPicker.setLocalDateTime(epochMillisToLocalDateTime(startMillis));
@ -592,7 +591,7 @@ final public class VisualizationPanel extends BorderPane {
LocalDateTime pickerTime = pickerSupplier.get().getLocalDateTime(); LocalDateTime pickerTime = pickerSupplier.get().getLocalDateTime();
if (pickerTime != null) { if (pickerTime != null) {
controller.pushTimeRange(intervalMapper.apply(filteredEvents.timeRangeProperty().get(), localDateTimeToEpochMilli(pickerTime))); controller.pushTimeRange(intervalMapper.apply(filteredEvents.timeRangeProperty().get(), localDateTimeToEpochMilli(pickerTime)));
Platform.runLater(() -> refreshTimeUI(filteredEvents.timeRangeProperty().get())); Platform.runLater(VisualizationPanel.this::refreshTimeUI);
} }
} }
} }