diff --git a/Timeline/src/org/sleuthkit/autopsy/timeline/Timeline.java b/Timeline/src/org/sleuthkit/autopsy/timeline/Timeline.java index 00b9f3e93b..5cb348fe09 100644 --- a/Timeline/src/org/sleuthkit/autopsy/timeline/Timeline.java +++ b/Timeline/src/org/sleuthkit/autopsy/timeline/Timeline.java @@ -123,8 +123,8 @@ public class Timeline extends CallableSystemAction implements Presenter.Toolbar, private JFXPanel fxPanelCharts; //FX panel to hold the group private BarChart fxChartEvents; //Yearly/Monthly events - Bar chart private ScrollPane fxScrollEvents; //Scroll Panes for dealing with oversized an oversized chart - private static final int FRAME_HEIGHT = 600; //Sizing constants - private static final int FRAME_WIDTH = 1000; + private static final int FRAME_HEIGHT = 700; //Sizing constants + private static final int FRAME_WIDTH = 1024; private Button fxZoomOutButton; //Navigation buttons private ComboBox fxDropdownSelectYears; //Dropdown box for selecting years. Useful when the charts' scale means some years are unclickable, despite having events. private final Stack fxStackPrevCharts = new Stack(); //Stack for storing drill-up information. @@ -209,7 +209,7 @@ public class Timeline extends CallableSystemAction implements Presenter.Toolbar, fxChartEvents = null; fxPanelCharts = new JFXPanel(); fxGroupCharts = new Group(); - fxSceneCharts = new Scene(fxGroupCharts, FRAME_WIDTH, FRAME_HEIGHT * 1); //Width, Height + fxSceneCharts = new Scene(fxGroupCharts, FRAME_WIDTH, FRAME_HEIGHT * 0.6); //Width, Height fxVBox = new VBox(5); fxVBox.setAlignment(Pos.BOTTOM_CENTER); fxHBoxCharts = new HBox(10); @@ -217,7 +217,7 @@ public class Timeline extends CallableSystemAction implements Presenter.Toolbar, //Initializing default values for the scroll pane fxScrollEvents = new ScrollPane(); - fxScrollEvents.setPrefSize(FRAME_WIDTH, FRAME_HEIGHT * 1); //Width, Height + fxScrollEvents.setPrefSize(FRAME_WIDTH, FRAME_HEIGHT * 0.6); //Width, Height fxScrollEvents.setContent(null); //Needs some content, otherwise it crashes // set up moduleDir @@ -301,15 +301,6 @@ public class Timeline extends CallableSystemAction implements Presenter.Toolbar, fxPanelCharts.setAlignmentX(Component.LEFT_ALIGNMENT); - EventQueue.invokeLater(new Runnable() { - @Override - public void run() { - // mainFrame.setTopPanel(fxPanelCharts); - //chartJPanel.setAlignmentX(Component.LEFT_ALIGNMENT); - } - }); - - fxChartTopLevel = createYearChartWithDrill(data); fxChartEvents = fxChartTopLevel; fxScrollEvents.setContent(fxChartEvents); diff --git a/Timeline/src/org/sleuthkit/autopsy/timeline/TimelineFrame.form b/Timeline/src/org/sleuthkit/autopsy/timeline/TimelineFrame.form index 83ff0a47d0..93ac28306e 100644 --- a/Timeline/src/org/sleuthkit/autopsy/timeline/TimelineFrame.form +++ b/Timeline/src/org/sleuthkit/autopsy/timeline/TimelineFrame.form @@ -7,7 +7,7 @@ - + @@ -41,11 +41,11 @@ - + - + @@ -54,7 +54,7 @@ - + @@ -70,7 +70,7 @@ - + @@ -85,7 +85,7 @@ - + @@ -99,7 +99,7 @@ - + diff --git a/Timeline/src/org/sleuthkit/autopsy/timeline/TimelineFrame.java b/Timeline/src/org/sleuthkit/autopsy/timeline/TimelineFrame.java index a6eb67c314..2e1d6245db 100644 --- a/Timeline/src/org/sleuthkit/autopsy/timeline/TimelineFrame.java +++ b/Timeline/src/org/sleuthkit/autopsy/timeline/TimelineFrame.java @@ -55,27 +55,27 @@ public class TimelineFrame extends javax.swing.JFrame { setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE); setTitle(org.openide.util.NbBundle.getMessage(TimelineFrame.class, "TimelineFrame.title")); // NOI18N - setPreferredSize(new java.awt.Dimension(1000, 600)); + setPreferredSize(new java.awt.Dimension(1024, 700)); - splitYPane.setDividerLocation(350); + splitYPane.setDividerLocation(420); splitYPane.setOrientation(javax.swing.JSplitPane.VERTICAL_SPLIT); splitYPane.setResizeWeight(0.5); - splitYPane.setPreferredSize(new java.awt.Dimension(1000, 300)); + splitYPane.setPreferredSize(new java.awt.Dimension(1024, 400)); - topPane.setPreferredSize(new java.awt.Dimension(1000, 300)); + topPane.setPreferredSize(new java.awt.Dimension(1024, 400)); topPane.setLayout(new java.awt.BorderLayout()); splitYPane.setLeftComponent(topPane); splitXPane.setDividerLocation(500); splitXPane.setResizeWeight(0.5); - splitXPane.setPreferredSize(new java.awt.Dimension(1000, 300)); + splitXPane.setPreferredSize(new java.awt.Dimension(1024, 300)); splitXPane.setRequestFocusEnabled(false); - leftPane.setPreferredSize(new java.awt.Dimension(500, 300)); + leftPane.setPreferredSize(new java.awt.Dimension(550, 300)); leftPane.setLayout(new java.awt.BorderLayout()); splitXPane.setLeftComponent(leftPane); - rightPane.setPreferredSize(new java.awt.Dimension(500, 300)); + rightPane.setPreferredSize(new java.awt.Dimension(450, 300)); rightPane.setLayout(new java.awt.BorderLayout()); splitXPane.setRightComponent(rightPane);