Merge pull request #144 from tmciver-basis/master

Removed drill down button.
This commit is contained in:
adam 2013-02-11 14:46:53 -08:00
commit 808753b51f

View File

@ -124,7 +124,6 @@ public class Simile2 extends CallableSystemAction implements Presenter.Toolbar,
private final int Height_Frame = 850; //Sizing constants private final int Height_Frame = 850; //Sizing constants
private final int Width_Frame = 1300; private final int Width_Frame = 1300;
private Button button_DrillUp; //Navigation buttons private Button button_DrillUp; //Navigation buttons
private Button button_DrillDown;
private Button button_Reset; private Button button_Reset;
private Button button_Go; private Button button_Go;
private ComboBox<String> dropdown_SelectYears; //Dropdown box for selecting years. Useful when the charts' scale means some years are unclickable, despite having events. private ComboBox<String> dropdown_SelectYears; //Dropdown box for selecting years. Useful when the charts' scale means some years are unclickable, despite having events.
@ -234,13 +233,6 @@ public class Simile2 extends CallableSystemAction implements Presenter.Toolbar,
dropdown_SelectYears = new ComboBox(listSelect); dropdown_SelectYears = new ComboBox(listSelect);
//Buttons for navigating up and down the timeline //Buttons for navigating up and down the timeline
button_DrillDown = new Button("Drill down");
button_DrillDown.setOnAction(new EventHandler<ActionEvent>() {
@Override
public void handle(ActionEvent e) {
//Placeholder, does nothing. Need to store a chart_LastSelected or something
}
});
button_DrillUp = new Button("Drill up"); button_DrillUp = new Button("Drill up");
button_DrillUp.setOnAction(new EventHandler<ActionEvent>() { button_DrillUp.setOnAction(new EventHandler<ActionEvent>() {
@Override @Override
@ -277,7 +269,7 @@ public class Simile2 extends CallableSystemAction implements Presenter.Toolbar,
//Adding things to the V and H boxes. //Adding things to the V and H boxes.
//hBox_Charts stores the pseudo menu bar at the top of the timeline. |Drill Up|Drill Down|Reset|View Year: [Select Year]|| //hBox_Charts stores the pseudo menu bar at the top of the timeline. |Drill Up|Drill Down|Reset|View Year: [Select Year]||
hBox_Charts.getChildren().addAll(button_DrillUp, button_DrillDown, button_Reset, new Label("View Year:"), dropdown_SelectYears, button_Go); hBox_Charts.getChildren().addAll(button_DrillUp, button_Reset, new Label("View Year:"), dropdown_SelectYears, button_Go);
vBox_FX.getChildren().addAll(hBox_Charts, scroll_Events); //FxBox_V holds things in a visual stack. vBox_FX.getChildren().addAll(hBox_Charts, scroll_Events); //FxBox_V holds things in a visual stack.
group_Charts.getChildren().add(vBox_FX); //Adding the FxBox to the group. Groups make things easier to manipulate without having to update a hundred things every change. group_Charts.getChildren().add(vBox_FX); //Adding the FxBox to the group. Groups make things easier to manipulate without having to update a hundred things every change.
panel_Charts.setScene(scene_Charts); panel_Charts.setScene(scene_Charts);