Merge pull request #532 from shahit2/timezoom

Timezoom
This commit is contained in:
Richard Cordovano 2014-03-06 14:39:40 -05:00
commit 222afe05cc

View File

@ -132,6 +132,7 @@ public class Timeline extends CallableSystemAction implements Presenter.Toolbar,
private ComboBox<String> fxDropdownSelectYears; //Dropdown box for selecting years. Useful when the charts' scale means some years are unclickable, despite having events.
private final Stack<BarChart<String, Number>> fxStackPrevCharts = new Stack<BarChart<String, Number>>(); //Stack for storing drill-up information.
private BarChart<String, Number> fxChartTopLevel; //the topmost chart, used for resetting to default view.
private BarChart<String, Number> fxMonthView; //the month chart
private DataResultPanel dataResultPanel;
private DataContentPanel dataContentPanel;
private ProgressHandle progress;
@ -145,6 +146,8 @@ public class Timeline extends CallableSystemAction implements Presenter.Toolbar,
private EventHandler<MouseEvent> fxMouseExitedListener;
private SleuthkitCase skCase;
private boolean fxInited = false;
private int monthCounter = 0;
public Timeline() {
super();
@ -279,7 +282,7 @@ public class Timeline extends CallableSystemAction implements Presenter.Toolbar,
if (fxStackPrevCharts.size() == 0) {
bc = fxChartTopLevel;
} else {
bc = fxStackPrevCharts.pop();
bc = fxStackPrevCharts.pop();
}
fxChartEvents = bc;
fxScrollEvents.setContent(fxChartEvents);
@ -412,7 +415,6 @@ public class Timeline extends CallableSystemAction implements Presenter.Toolbar,
* Always 12 per year, empty months are represented by no bar.
*/
private BarChart<String, Number> createMonthsWithDrill(final YearEpoch ye) {
final CategoryAxis xAxis = new CategoryAxis();
final NumberAxis yAxis = new NumberAxis();
xAxis.setLabel("Month (" + ye.year + ")");
@ -467,7 +469,7 @@ public class Timeline extends CallableSystemAction implements Presenter.Toolbar,
bc.autosize();
bc.setPrefWidth(FRAME_WIDTH);
bc.setLegendVisible(false);
fxStackPrevCharts.push(bc);
fxMonthView= bc;
return bc;
}
@ -540,7 +542,13 @@ public class Timeline extends CallableSystemAction implements Presenter.Toolbar,
});
}
bc.autosize();
bc.setPrefWidth(FRAME_WIDTH);
bc.setPrefWidth(FRAME_WIDTH);
monthCounter++;
if (monthCounter==12)
{
fxStackPrevCharts.push(fxMonthView);
monthCounter=0;
}
return bc;
}