adjust minor sizing in timeline

This commit is contained in:
adam-m 2013-03-14 14:03:24 -04:00
parent cf29210275
commit 1e22f72a97
3 changed files with 18 additions and 27 deletions

View File

@ -123,8 +123,8 @@ public class Timeline extends CallableSystemAction implements Presenter.Toolbar,
private JFXPanel fxPanelCharts; //FX panel to hold the group private JFXPanel fxPanelCharts; //FX panel to hold the group
private BarChart fxChartEvents; //Yearly/Monthly events - Bar chart private BarChart fxChartEvents; //Yearly/Monthly events - Bar chart
private ScrollPane fxScrollEvents; //Scroll Panes for dealing with oversized an oversized 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_HEIGHT = 700; //Sizing constants
private static final int FRAME_WIDTH = 1000; private static final int FRAME_WIDTH = 1024;
private Button fxZoomOutButton; //Navigation buttons private Button fxZoomOutButton; //Navigation buttons
private ComboBox<String> fxDropdownSelectYears; //Dropdown box for selecting years. Useful when the charts' scale means some years are unclickable, despite having events. 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> fxStackPrevCharts = new Stack<BarChart>(); //Stack for storing drill-up information. private final Stack<BarChart> fxStackPrevCharts = new Stack<BarChart>(); //Stack for storing drill-up information.
@ -209,7 +209,7 @@ public class Timeline extends CallableSystemAction implements Presenter.Toolbar,
fxChartEvents = null; fxChartEvents = null;
fxPanelCharts = new JFXPanel(); fxPanelCharts = new JFXPanel();
fxGroupCharts = new Group(); 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 = new VBox(5);
fxVBox.setAlignment(Pos.BOTTOM_CENTER); fxVBox.setAlignment(Pos.BOTTOM_CENTER);
fxHBoxCharts = new HBox(10); fxHBoxCharts = new HBox(10);
@ -217,7 +217,7 @@ public class Timeline extends CallableSystemAction implements Presenter.Toolbar,
//Initializing default values for the scroll pane //Initializing default values for the scroll pane
fxScrollEvents = new ScrollPane(); 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 fxScrollEvents.setContent(null); //Needs some content, otherwise it crashes
// set up moduleDir // set up moduleDir
@ -301,15 +301,6 @@ public class Timeline extends CallableSystemAction implements Presenter.Toolbar,
fxPanelCharts.setAlignmentX(Component.LEFT_ALIGNMENT); fxPanelCharts.setAlignmentX(Component.LEFT_ALIGNMENT);
EventQueue.invokeLater(new Runnable() {
@Override
public void run() {
// mainFrame.setTopPanel(fxPanelCharts);
//chartJPanel.setAlignmentX(Component.LEFT_ALIGNMENT);
}
});
fxChartTopLevel = createYearChartWithDrill(data); fxChartTopLevel = createYearChartWithDrill(data);
fxChartEvents = fxChartTopLevel; fxChartEvents = fxChartTopLevel;
fxScrollEvents.setContent(fxChartEvents); fxScrollEvents.setContent(fxChartEvents);

View File

@ -7,7 +7,7 @@
<ResourceString bundle="org/sleuthkit/autopsy/timeline/Bundle.properties" key="TimelineFrame.title" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/> <ResourceString bundle="org/sleuthkit/autopsy/timeline/Bundle.properties" key="TimelineFrame.title" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
</Property> </Property>
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[1000, 600]"/> <Dimension value="[1024, 700]"/>
</Property> </Property>
</Properties> </Properties>
<SyntheticProperties> <SyntheticProperties>
@ -41,11 +41,11 @@
<SubComponents> <SubComponents>
<Container class="javax.swing.JSplitPane" name="splitYPane"> <Container class="javax.swing.JSplitPane" name="splitYPane">
<Properties> <Properties>
<Property name="dividerLocation" type="int" value="350"/> <Property name="dividerLocation" type="int" value="420"/>
<Property name="orientation" type="int" value="0"/> <Property name="orientation" type="int" value="0"/>
<Property name="resizeWeight" type="double" value="0.5"/> <Property name="resizeWeight" type="double" value="0.5"/>
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[1000, 300]"/> <Dimension value="[1024, 400]"/>
</Property> </Property>
</Properties> </Properties>
@ -54,7 +54,7 @@
<Container class="javax.swing.JPanel" name="topPane"> <Container class="javax.swing.JPanel" name="topPane">
<Properties> <Properties>
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[1000, 300]"/> <Dimension value="[1024, 400]"/>
</Property> </Property>
</Properties> </Properties>
<Constraints> <Constraints>
@ -70,7 +70,7 @@
<Property name="dividerLocation" type="int" value="500"/> <Property name="dividerLocation" type="int" value="500"/>
<Property name="resizeWeight" type="double" value="0.5"/> <Property name="resizeWeight" type="double" value="0.5"/>
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[1000, 300]"/> <Dimension value="[1024, 300]"/>
</Property> </Property>
<Property name="requestFocusEnabled" type="boolean" value="false"/> <Property name="requestFocusEnabled" type="boolean" value="false"/>
</Properties> </Properties>
@ -85,7 +85,7 @@
<Container class="javax.swing.JPanel" name="leftPane"> <Container class="javax.swing.JPanel" name="leftPane">
<Properties> <Properties>
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[500, 300]"/> <Dimension value="[550, 300]"/>
</Property> </Property>
</Properties> </Properties>
<Constraints> <Constraints>
@ -99,7 +99,7 @@
<Container class="javax.swing.JPanel" name="rightPane"> <Container class="javax.swing.JPanel" name="rightPane">
<Properties> <Properties>
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[500, 300]"/> <Dimension value="[450, 300]"/>
</Property> </Property>
</Properties> </Properties>
<Constraints> <Constraints>

View File

@ -55,27 +55,27 @@ public class TimelineFrame extends javax.swing.JFrame {
setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE); setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE);
setTitle(org.openide.util.NbBundle.getMessage(TimelineFrame.class, "TimelineFrame.title")); // NOI18N 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.setOrientation(javax.swing.JSplitPane.VERTICAL_SPLIT);
splitYPane.setResizeWeight(0.5); 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()); topPane.setLayout(new java.awt.BorderLayout());
splitYPane.setLeftComponent(topPane); splitYPane.setLeftComponent(topPane);
splitXPane.setDividerLocation(500); splitXPane.setDividerLocation(500);
splitXPane.setResizeWeight(0.5); splitXPane.setResizeWeight(0.5);
splitXPane.setPreferredSize(new java.awt.Dimension(1000, 300)); splitXPane.setPreferredSize(new java.awt.Dimension(1024, 300));
splitXPane.setRequestFocusEnabled(false); 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()); leftPane.setLayout(new java.awt.BorderLayout());
splitXPane.setLeftComponent(leftPane); 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()); rightPane.setLayout(new java.awt.BorderLayout());
splitXPane.setRightComponent(rightPane); splitXPane.setRightComponent(rightPane);