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

change interval selector to BorderPane

Browse Source
This commit is contained in:
jmillman 2015-10-14 17:00:27 -04:00
parent 49965d73a2
commit b31e172f13
6 changed files with 299 additions and 194 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Core/src/org/sleuthkit/autopsy/timeline/ui/IntervalSelector.css Normal file
View File

@ -0,0 +1,13 @@
.intervalSelector{
-fx-background-color: rgba(0,0,255,.5);
-fx-border-color: rgba(0,0,255,.5);
-fx-border-width: 3;
}
.closeButton:hover{
-fx-opacity: 1;
}
.zoomButton:hover{
-fx-opacity: 1;
}

41
Core/src/org/sleuthkit/autopsy/timeline/ui/IntervalSelector.fxml Normal file
View File

@ -0,0 +1,41 @@
<?xml version="1.0" encoding="UTF-8"?>
<?import javafx.geometry.*?>
<?import javafx.scene.image.*?>
<?import javafx.scene.control.*?>
<?import java.lang.*?>
<?import javafx.scene.layout.*?>
<fx:root maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" styleClass="intervalSelector" stylesheets="@IntervalSelector.css" type="BorderPane" xmlns="http://javafx.com/javafx/8.0.40" xmlns:fx="http://javafx.com/fxml/1">
<left>
<Label fx:id="startLabel" text="Label" BorderPane.alignment="CENTER" />
</left>
<right>
<Label fx:id="endLabel" text="Label" BorderPane.alignment="CENTER" />
</right>
<top>
<Button fx:id="closeButton" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" mnemonicParsing="false" opacity="0.5" prefHeight="24.0" prefWidth="24.0" styleClass="closebutton" BorderPane.alignment="CENTER_RIGHT">
<graphic>
<ImageView opacity="0.5" pickOnBounds="true" preserveRatio="true">
<image>
<Image url="@../images/cross-circle.png" />
</image>
</ImageView>
</graphic>
</Button>
</top>
<padding>
<Insets bottom="3.0" left="3.0" right="3.0" top="3.0" />
</padding>
<center>
<Button fx:id="zoomButton" mnemonicParsing="false" opacity="0.5" styleClass="zoomButton" text="Zoom" BorderPane.alignment="CENTER">
<graphic>
<ImageView pickOnBounds="true" preserveRatio="true">
<image>
<Image url="@../images/magnifier-zoom-fit.png" />
</image>
</ImageView>
</graphic>
</Button>
</center>
</fx:root>

211
Core/src/org/sleuthkit/autopsy/timeline/ui/IntervalSelector.java Normal file
View File

@ -0,0 +1,211 @@
/*
* To change this license header, choose License Headers in Project Properties.
* To change this template file, choose Tools | Templates
* and open the template in the editor.
*/
package org.sleuthkit.autopsy.timeline.ui;
import javafx.event.EventHandler;
import javafx.geometry.Insets;
import javafx.geometry.Point2D;
import javafx.scene.Cursor;
import javafx.scene.chart.Axis;
import javafx.scene.control.Tooltip;
import javafx.scene.input.MouseEvent;
import javafx.scene.layout.Background;
import javafx.scene.layout.BackgroundFill;
import javafx.scene.layout.Border;
import javafx.scene.layout.BorderPane;
import javafx.scene.layout.BorderStroke;
import javafx.scene.layout.BorderStrokeStyle;
import javafx.scene.layout.BorderWidths;
import javafx.scene.layout.CornerRadii;
import javafx.scene.paint.Color;
import org.joda.time.DateTime;
import org.joda.time.Interval;
import org.openide.util.NbBundle;
import org.sleuthkit.autopsy.timeline.FXMLConstructor;
import org.sleuthkit.autopsy.timeline.TimeLineController;
/**
* Visually represents a 'selected' time range, and allows mouse interactions
* with it.
*
* @param <X> the type of values along the x axis this is a selector for
*
* This abstract class requires concrete implementations to implement hook
* methods to handle formating and date 'lookup' of the generic x-axis type
*/
public abstract class IntervalSelector<X> extends BorderPane {
private static final double STROKE_WIDTH = 3;
private static final double HALF_STROKE = STROKE_WIDTH / 2;
/**
* the Axis this is a selector over
*/
private final Axis<X> dateAxis;
private Tooltip tooltip;
/////////drag state
private DragPosition dragPosition;
private double startLeft;
private double startX;
private double startWidth;
/////////end drag state
private TimeLineController controller;
public IntervalSelector(Axis<X> dateAxis, TimeLineController controller) {
this.dateAxis = dateAxis;
this.controller = controller;
FXMLConstructor.construct(this, "TimeZonePanel.fxml"); // NON-NLS
}
/**
*
* @param x the initial x position of this selector
* @param height the initial height of this selector
* @param axis the {@link Axis<X>} this is a selector over
* @param controller the controller to invoke when this selector is double
* clicked
*/
public IntervalSelector(double x, double height, Axis<X> axis, TimeLineController controller) {
setMaxHeight(USE_PREF_SIZE);
setMinHeight(USE_PREF_SIZE);
setMaxWidth(USE_PREF_SIZE);
setMinWidth(USE_PREF_SIZE);
dateAxis = axis;
setBorder(new Border(new BorderStroke(Color.BLUE, BorderStrokeStyle.SOLID, CornerRadii.EMPTY, new BorderWidths(STROKE_WIDTH))));
// setStroke(Color.BLUE);
// setStrokeWidth(STROKE_WIDTH);
setBackground(new Background(new BackgroundFill(Color.BLUE.deriveColor(0, 1, 1, 0.5), CornerRadii.EMPTY, Insets.EMPTY)));
setOpacity(0.5);
widthProperty().addListener((o) -> {
setTooltip();
});
layoutXProperty().addListener((o) -> {
setTooltip();
});
setTooltip();
setOnMouseMoved((MouseEvent event) -> {
Point2D localMouse = sceneToLocal(new Point2D(event.getSceneX(), event.getSceneY()));
final double diffX = getLayoutX() - localMouse.getX();
if (Math.abs(diffX) <= HALF_STROKE || Math.abs(diffX + getWidth()) <= HALF_STROKE) {
//if the mouse is over the stroke, show the resize cursor
setCursor(Cursor.H_RESIZE);
} else {
setCursor(Cursor.HAND);
}
});
setOnMousePressed((MouseEvent event) -> {
Point2D localMouse = sceneToLocal(new Point2D(event.getSceneX(), event.getSceneY()));
final double diffX = getLayoutX() - localMouse.getX();
startX = event.getX();
startWidth = getWidth();
startLeft = getLayoutX();
if (Math.abs(diffX) <= HALF_STROKE) {
dragPosition = IntervalSelector.DragPosition.LEFT;
} else if (Math.abs(diffX + getWidth()) <= HALF_STROKE) {
dragPosition = IntervalSelector.DragPosition.RIGHT;
} else {
dragPosition = IntervalSelector.DragPosition.CENTER;
}
});
setOnMouseDragged((MouseEvent event) -> {
double dX = event.getX() - startX;
switch (dragPosition) {
case CENTER:
relocate(startLeft + dX, 0);
break;
case LEFT:
relocate(startLeft + dX, 0);
setPrefWidth(startWidth - dX);
break;
case RIGHT:
setPrefWidth(startWidth + dX);
break;
}
event.consume();
});
//have to add handler rather than use convenience methods so that charts can listen for dismisal click
addEventHandler(MouseEvent.MOUSE_CLICKED, new EventHandler<MouseEvent>() {
public void handle(MouseEvent event) {
if (event.getClickCount() >= 2) {
//convert to DateTimes, using max/min if null(off axis)
DateTime start = parseDateTime(getSpanStart());
DateTime end = parseDateTime(getSpanEnd());
Interval i = adjustInterval(start.isBefore(end) ? new Interval(start, end) : new Interval(end, start));
controller.pushTimeRange(i);
event.consume();
}
}
});
}
/**
*
* @param i the interval represented by this selector
*
* @return a modified version of {@code i} adjusted to suite the needs of
* the concrete implementation
*/
protected abstract Interval adjustInterval(Interval i);
/**
* format a string representation of the given x-axis value to use in the
* tooltip
*
* @param date a x-axis value of type X
*
* @return a string representation of the given x-axis value
*/
protected abstract String formatSpan(final X date);
/**
* parse an x-axis value to a {@link DateTime}
*
* @param date a x-axis value of type X
*
* @return a {@link DateTime} corresponding to the given x-axis value
*/
protected abstract DateTime parseDateTime(X date);
@NbBundle.Messages(value = {"# {0} - start timestamp", "# {1} - end timestamp", "Timeline.ui.TimeLineChart.tooltip.text=Double-click to zoom into range:\n{0} to {1}\nRight-click to clear."})
private void setTooltip() {
final X start = getSpanStart();
final X end = getSpanEnd();
Tooltip.uninstall(this, tooltip);
tooltip = new Tooltip(Bundle.Timeline_ui_TimeLineChart_tooltip_text(formatSpan(start), formatSpan(end)));
Tooltip.install(this, tooltip);
}
/**
* @return the value along the x-axis corresponding to the left edge of the
* selector
*/
public X getSpanEnd() {
return dateAxis.getValueForDisplay(dateAxis.parentToLocal(getBoundsInParent().getMaxX(), 0).getX());
}
/**
* @return the value along the x-axis corresponding to the right edge of the
* selector
*/
public X getSpanStart() {
return dateAxis.getValueForDisplay(dateAxis.parentToLocal(getBoundsInParent().getMinX(), 0).getX());
}
/**
* enum to represent whether the drag is a left/right-edge modification or a
* horizontal slide triggered by dragging the center
*/
private enum DragPosition {
LEFT,
CENTER,
RIGHT
}
}

200
Core/src/org/sleuthkit/autopsy/timeline/ui/TimeLineChart.java
View File

@ -21,6 +21,7 @@ package org.sleuthkit.autopsy.timeline.ui;
import javafx.event.ActionEvent;
import javafx.event.EventHandler;
import javafx.event.EventType;
import javafx.geometry.Insets;
import javafx.geometry.Point2D;
import javafx.scene.Cursor;
import javafx.scene.chart.Axis;
@ -30,8 +31,15 @@ import javafx.scene.image.Image;
import javafx.scene.image.ImageView;
import javafx.scene.input.MouseButton;
import javafx.scene.input.MouseEvent;
import javafx.scene.layout.Background;
import javafx.scene.layout.BackgroundFill;
import javafx.scene.layout.Border;
import javafx.scene.layout.BorderStroke;
import javafx.scene.layout.BorderStrokeStyle;
import javafx.scene.layout.BorderWidths;
import javafx.scene.layout.CornerRadii;
import javafx.scene.layout.StackPane;
import javafx.scene.paint.Color;
import javafx.scene.shape.Rectangle;
import org.controlsfx.control.action.Action;
import org.controlsfx.control.action.ActionGroup;
import org.joda.time.DateTime;
@ -113,7 +121,7 @@ public interface TimeLineChart<X> extends TimeLineView {
if (chart.getIntervalSelector() == null) {
//make new interval selector
chart.setIntervalSelector(chart.newIntervalSelector(mouseEvent.getX(), dateAxis));
chart.getIntervalSelector().heightProperty().bind(chart.heightProperty().subtract(dateAxis.heightProperty().subtract(dateAxis.tickLengthProperty())));
chart.getIntervalSelector().prefHeightProperty().bind(chart.heightProperty());
IntervalSelector<? extends X> intervalSelector = chart.getIntervalSelector();
if (intervalSelector != null) {
intervalSelector.addEventHandler(MouseEvent.MOUSE_CLICKED, (MouseEvent event) -> {
@ -127,11 +135,11 @@ public interface TimeLineChart<X> extends TimeLineView {
} else {
//resize/position existing selector
if (mouseEvent.getX() > startX) {
chart.getIntervalSelector().setX(startX);
chart.getIntervalSelector().setWidth(mouseEvent.getX() - startX);
// chart.getIntervalSelector().relocate(startX, 0);
chart.getIntervalSelector().setPrefWidth(mouseEvent.getX() - startX);
} else {
chart.getIntervalSelector().setX(mouseEvent.getX());
chart.getIntervalSelector().setWidth(startX - mouseEvent.getX());
chart.getIntervalSelector().relocate(mouseEvent.getX(), 0);
chart.getIntervalSelector().setPrefWidth(startX - mouseEvent.getX());
}
}
mouseEvent.consume();
@ -147,6 +155,11 @@ public interface TimeLineChart<X> extends TimeLineView {
mouseEvent.consume();
}
if (chart.getIntervalSelector() != null) {
chart.getIntervalSelector().autosize();
System.out.println(chart.getIntervalSelector().getBoundsInLocal());
}
}
}
@ -175,179 +188,4 @@ public interface TimeLineChart<X> extends TimeLineView {
new Forward(controller));
}
/**
* Visually represents a 'selected' time range, and allows mouse
* interactions with it.
*
* @param <X> the type of values along the x axis this is a selector for
*
* This abstract class requires concrete implementations to implement hook
* methods to handle formating and date 'lookup' of the generic x-axis type
*/
static abstract class IntervalSelector<X> extends Rectangle {
private static final double STROKE_WIDTH = 3;
private static final double HALF_STROKE = STROKE_WIDTH / 2;
/**
* the Axis this is a selector over
*/
private final Axis<X> dateAxis;
private Tooltip tooltip;
/////////drag state
private DragPosition dragPosition;
private double startLeft;
private double startX;
private double startWidth;
/////////end drag state
/**
*
* @param x the initial x position of this selector
* @param height the initial height of this selector
* @param axis the {@link Axis<X>} this is a selector over
* @param controller the controller to invoke when this selector is
* double clicked
*/
public IntervalSelector(double x, double height, Axis<X> axis, TimeLineController controller) {
super(x, 0, x, height);
dateAxis = axis;
setStroke(Color.BLUE);
setStrokeWidth(STROKE_WIDTH);
setFill(Color.BLUE.deriveColor(0, 1, 1, 0.5));
setOpacity(0.5);
widthProperty().addListener(o -> {
setTooltip();
});
xProperty().addListener(o -> {
setTooltip();
});
setTooltip();
setOnMouseMoved((MouseEvent event) -> {
Point2D localMouse = sceneToLocal(new Point2D(event.getSceneX(), event.getSceneY()));
final double diffX = getX() - localMouse.getX();
if (Math.abs(diffX) <= HALF_STROKE || Math.abs(diffX + getWidth()) <= HALF_STROKE) {
//if the mouse is over the stroke, show the resize cursor
setCursor(Cursor.H_RESIZE);
} else {
setCursor(Cursor.HAND);
}
});
setOnMousePressed((MouseEvent event) -> {
Point2D localMouse = sceneToLocal(new Point2D(event.getSceneX(), event.getSceneY()));
final double diffX = getX() - localMouse.getX();
startX = event.getX();
startWidth = getWidth();
startLeft = getX();
if (Math.abs(diffX) <= HALF_STROKE) {
dragPosition = IntervalSelector.DragPosition.LEFT;
} else if (Math.abs(diffX + getWidth()) <= HALF_STROKE) {
dragPosition = IntervalSelector.DragPosition.RIGHT;
} else {
dragPosition = IntervalSelector.DragPosition.CENTER;
}
});
setOnMouseDragged((MouseEvent event) -> {
double dX = event.getX() - startX;
switch (dragPosition) {
case CENTER:
setX(startLeft + dX);
break;
case LEFT:
setX(startLeft + dX);
setWidth(startWidth - dX);
break;
case RIGHT:
setWidth(startWidth + dX);
break;
}
event.consume();
});
//have to add handler rather than use convenience methods so that charts can listen for dismisal click
addEventHandler(MouseEvent.MOUSE_CLICKED, new EventHandler<MouseEvent>() {
public void handle(MouseEvent event) {
if (event.getClickCount() >= 2) {
//convert to DateTimes, using max/min if null(off axis)
DateTime start = parseDateTime(getSpanStart());
DateTime end = parseDateTime(getSpanEnd());
Interval i = adjustInterval(start.isBefore(end) ? new Interval(start, end) : new Interval(end, start));
controller.pushTimeRange(i);
event.consume();
}
}
});
}
/**
*
* @param i the interval represented by this selector
*
* @return a modified version of {@code i} adjusted to suite the needs
* of the concrete implementation
*/
protected abstract Interval adjustInterval(Interval i);
/**
* format a string representation of the given x-axis value to use in
* the tooltip
*
* @param date a x-axis value of type X
*
* @return a string representation of the given x-axis value
*/
protected abstract String formatSpan(final X date);
/**
* parse an x-axis value to a {@link DateTime}
*
* @param date a x-axis value of type X
*
* @return a {@link DateTime} corresponding to the given x-axis value
*/
protected abstract DateTime parseDateTime(X date);
@NbBundle.Messages({"# {0} - start timestamp",
"# {1} - end timestamp",
"Timeline.ui.TimeLineChart.tooltip.text=Double-click to zoom into range:\n{0} to {1}\nRight-click to clear."})
private void setTooltip() {
final X start = getSpanStart();
final X end = getSpanEnd();
Tooltip.uninstall(this, tooltip);
tooltip = new Tooltip(
Bundle.Timeline_ui_TimeLineChart_tooltip_text(formatSpan(start), formatSpan(end)));
Tooltip.install(this, tooltip);
}
/**
* @return the value along the x-axis corresponding to the left edge of
* the selector
*/
public X getSpanEnd() {
return dateAxis.getValueForDisplay(dateAxis.parentToLocal(getBoundsInParent().getMaxX(), 0).getX());
}
/**
* @return the value along the x-axis corresponding to the right edge of
* the selector
*/
public X getSpanStart() {
return dateAxis.getValueForDisplay(dateAxis.parentToLocal(getBoundsInParent().getMinX(), 0).getX());
}
/**
* enum to represent whether the drag is a left/right-edge modification
* or a horizontal slide triggered by dragging the center
*/
private enum DragPosition {
LEFT,
CENTER,
RIGHT
}
}
}

1
Core/src/org/sleuthkit/autopsy/timeline/ui/countsview/EventCountsChart.java
View File

@ -35,6 +35,7 @@ import org.joda.time.Interval;
import org.openide.util.NbBundle;
import org.sleuthkit.autopsy.timeline.TimeLineController;
import org.sleuthkit.autopsy.timeline.datamodel.FilteredEventsModel;
import org.sleuthkit.autopsy.timeline.ui.IntervalSelector;
import org.sleuthkit.autopsy.timeline.ui.TimeLineChart;
import org.sleuthkit.autopsy.timeline.utils.RangeDivisionInfo;

1
Core/src/org/sleuthkit/autopsy/timeline/ui/detailview/EventDetailChart.java
View File

@ -74,6 +74,7 @@ import org.sleuthkit.autopsy.timeline.datamodel.FilteredEventsModel;
import org.sleuthkit.autopsy.timeline.datamodel.eventtype.EventType;
import org.sleuthkit.autopsy.timeline.filters.AbstractFilter;
import org.sleuthkit.autopsy.timeline.filters.DescriptionFilter;
import org.sleuthkit.autopsy.timeline.ui.IntervalSelector;
import org.sleuthkit.autopsy.timeline.ui.TimeLineChart;
import org.sleuthkit.autopsy.timeline.zooming.DescriptionLoD;